Tests: full test results

innodb.innodb-index-online-fk
innodb.instant_alter_debug
innodb.innodb_skip_innodb_is_tables
sys_vars.sysvars_server_notembedded
main.mysqld--help

mysql-test/r/mysqld--help.result

@@ -1277,8 +1277,6 @@ The following options may be given as the first argument:
  system rows as is on ALTER TABLE; SURVIVE: use DDL
  survival feature; DROP: delete historical system rows on
  ALTER TABLE
- --versioning-asof-timestamp=name 
- Default AS OF value for versioned queries
  --versioning-force  Force system versioning for all created tables
  --versioning-hide=name 
  Hide system versioning from being displayed in table

mysql-test/suite/innodb/r/innodb-index-online-fk.result

@@ -124,8 +124,10 @@ SYS_FOREIGN
 SYS_FOREIGN_COLS
 SYS_TABLESPACES
 SYS_VIRTUAL
+SYS_VTQ
 mysql/innodb_index_stats
 mysql/innodb_table_stats
+mysql/vtmd_template
 test/child
 test/parent
 INSERT INTO child VALUES(5,4);
@@ -315,8 +317,10 @@ SYS_FOREIGN
 SYS_FOREIGN_COLS
 SYS_TABLESPACES
 SYS_VIRTUAL
+SYS_VTQ
 mysql/innodb_index_stats
 mysql/innodb_table_stats
+mysql/vtmd_template
 test/child
 test/parent
 ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT,
@@ -340,8 +344,10 @@ SYS_FOREIGN
 SYS_FOREIGN_COLS
 SYS_TABLESPACES
 SYS_VIRTUAL
+SYS_VTQ
 mysql/innodb_index_stats
 mysql/innodb_table_stats
+mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;
@@ -376,8 +382,10 @@ SYS_FOREIGN
 SYS_FOREIGN_COLS
 SYS_TABLESPACES
 SYS_VIRTUAL
+SYS_VTQ
 mysql/innodb_index_stats
 mysql/innodb_table_stats
+mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;
@@ -412,8 +420,10 @@ SYS_FOREIGN
 SYS_FOREIGN_COLS
 SYS_TABLESPACES
 SYS_VIRTUAL
+SYS_VTQ
 mysql/innodb_index_stats
 mysql/innodb_table_stats
+mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;

mysql-test/suite/innodb/r/instant_alter_debug.result

@@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
 LEFT JOIN t4 ON (NUMERIC_SCALE = pk);
 COUNT(*)
-1734
+1740
 SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete';
 ALTER TABLE t4 ADD COLUMN c INT;
 connect  dml,localhost,root,,;

mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test

@@ -1,5 +1,4 @@
 --source include/not_embedded.inc
---source include/have_xtradb.inc
 
 select * from information_schema.innodb_trx;
 select * from information_schema.innodb_locks;

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -5295,27 +5295,27 @@ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	KEEP
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Versioning ALTER TABLE mode
+VARIABLE_COMMENT	Versioning ALTER TABLE mode. KEEP: leave historical system rows as is on ALTER TABLE; SURVIVE: use DDL survival feature; DROP: delete historical system rows on ALTER TABLE
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	KEEP,SURVIVE,DROP
 READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
-VARIABLE_NAME	VERSIONING_CURRENT_TIMESTAMP
-SESSION_VALUE	NOW
-GLOBAL_VALUE	NOW
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	VERSIONING_ASOF_TIMESTAMP
+SESSION_VALUE	CURRENT
+GLOBAL_VALUE	CURRENT
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	now
+DEFAULT_VALUE	CURRENT
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Default AS OF value for versioned tables
+VARIABLE_COMMENT	Default AS OF value for versioned queries
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	NULL
+ENUM_VALUE_LIST	CURRENT,ALL
 READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	VERSIONING_FORCE
 SESSION_VALUE	OFF
 GLOBAL_VALUE	OFF
@@ -5343,7 +5343,7 @@ NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	AUTO,IMPLICIT,FULL,NEVER
 READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	VERSIONING_INNODB_ALGORITHM_SIMPLE
 SESSION_VALUE	ON
 GLOBAL_VALUE	ON

sql/handler.cc

@@ -2435,12 +2435,6 @@ LEX_CSTRING *handler::engine_name()
 }
 
 
-void handler::ha_statistic_increment(ulong SSV::*offset) const
-{
-  (table->in_use->status_var.*offset)++;
-}
-
-
 double handler::keyread_time(uint index, uint ranges, ha_rows rows)
 {
   /*

sql/handler.h

@@ -4124,7 +4124,6 @@ class handler :public Sql_alloc
   TABLE_SHARE* get_table_share() { return table_share; }
 protected:
   /* Service methods for use by storage engines. */
-  void ha_statistic_increment(ulong SSV::*offset) const;
   void **ha_data(THD *) const;
   THD *ha_thd(void) const;