Tests: full test results [#387]

14 files changed, 161 insertions, 169 deletions

diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result
index 730a02f6bfa..85e56ff176e 100644
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/r/derived_view.result
@@ -2312,8 +2312,6 @@ Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 DROP TABLE t1;
 SET SESSION optimizer_switch= @save_optimizer_switch;
 #
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index 1b7772c2d10..8a92f0226ff 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -454,4 +454,4 @@ Wildcard: inf_rmation_schema
 SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
 information_schema	64
-mysql	32
+mysql	31
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index 5ae834e8ce8..046674d5569 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -763,7 +763,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 drop table t1;
 drop table t2;
 drop table t3;
diff --git a/mysql-test/r/mysqlbinlog_row_compressed.result b/mysql-test/r/mysqlbinlog_row_compressed.result
index fccc32e57e5..fc44934ef3f 100644
--- a/mysql-test/r/mysqlbinlog_row_compressed.result
+++ b/mysql-test/r/mysqlbinlog_row_compressed.result
@@ -61,7 +61,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
 #<date> server id 1  end_log_pos 899 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 899
-#<date> server id 1  end_log_pos 967 CRC32 XXX 	Write_compressed_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 967 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -89,7 +89,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
 #<date> server id 1  end_log_pos 1214 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1214
-#<date> server id 1  end_log_pos 1281 CRC32 XXX 	Write_compressed_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1281 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
@@ -117,7 +117,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
 #<date> server id 1  end_log_pos 1530 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1530
-#<date> server id 1  end_log_pos 1596 CRC32 XXX 	Write_compressed_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1596 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
@@ -145,7 +145,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
 #<date> server id 1  end_log_pos 1842 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1842
-#<date> server id 1  end_log_pos 1909 CRC32 XXX 	Write_compressed_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1909 CRC32 XXX 	Write_compressed_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
@@ -173,7 +173,7 @@ BEGIN
 #Q> INSERT INTO t2 SELECT * FROM t1
 #<date> server id 1  end_log_pos 2134 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 2134
-#<date> server id 1  end_log_pos 2225 CRC32 XXX 	Write_compressed_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2225 CRC32 XXX 	Write_compressed_rows: table id 32 flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -234,7 +234,7 @@ BEGIN
 #Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
 #<date> server id 1  end_log_pos 2462 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 2462
-#<date> server id 1  end_log_pos 2561 CRC32 XXX 	Update_compressed_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2561 CRC32 XXX 	Update_compressed_rows: table id 32 flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -314,7 +314,7 @@ BEGIN
 #Q> DELETE FROM t1
 #<date> server id 1  end_log_pos 2769 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 2769
-#<date> server id 1  end_log_pos 2861 CRC32 XXX 	Delete_compressed_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2861 CRC32 XXX 	Delete_compressed_rows: table id 31 flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -375,7 +375,7 @@ BEGIN
 #Q> DELETE FROM t2
 #<date> server id 1  end_log_pos 3069 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 3069
-#<date> server id 1  end_log_pos 3154 CRC32 XXX 	Delete_compressed_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 3154 CRC32 XXX 	Delete_compressed_rows: table id 32 flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
diff --git a/mysql-test/r/mysqlbinlog_row_minimal.result b/mysql-test/r/mysqlbinlog_row_minimal.result
index fd93f0538b7..9cdac056078 100644
--- a/mysql-test/r/mysqlbinlog_row_minimal.result
+++ b/mysql-test/r/mysqlbinlog_row_minimal.result
@@ -59,7 +59,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
 #<date> server id 1  end_log_pos 946 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 946
-#<date> server id 1  end_log_pos 1015 CRC32 XXX 	Write_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1015 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -87,7 +87,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
 #<date> server id 1  end_log_pos 1262 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1262
-#<date> server id 1  end_log_pos 1330 CRC32 XXX 	Write_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1330 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=11 /* INT meta=0 nullable=0 is_null=0 */
@@ -115,7 +115,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
 #<date> server id 1  end_log_pos 1579 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1579
-#<date> server id 1  end_log_pos 1646 CRC32 XXX 	Write_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1646 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=12 /* INT meta=0 nullable=0 is_null=0 */
@@ -143,7 +143,7 @@ BEGIN
 #Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
 #<date> server id 1  end_log_pos 1892 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 1892
-#<date> server id 1  end_log_pos 1962 CRC32 XXX 	Write_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 1962 CRC32 XXX 	Write_rows: table id 31 flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=13 /* INT meta=0 nullable=0 is_null=0 */
@@ -171,7 +171,7 @@ BEGIN
 #Q> INSERT INTO t2 SELECT * FROM t1
 #<date> server id 1  end_log_pos 2187 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 2187
-#<date> server id 1  end_log_pos 2354 CRC32 XXX 	Write_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2354 CRC32 XXX 	Write_rows: table id 32 flags: STMT_END_F
 ### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -232,7 +232,7 @@ BEGIN
 #Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
 #<date> server id 1  end_log_pos 2591 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 2591
-#<date> server id 1  end_log_pos 2665 CRC32 XXX 	Update_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2665 CRC32 XXX 	Update_rows: table id 32 flags: STMT_END_F
 ### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -267,7 +267,7 @@ BEGIN
 #Q> DELETE FROM t1
 #<date> server id 1  end_log_pos 2873 CRC32 XXX 	Table_map: `test`.`t1` mapped to number num
 # at 2873
-#<date> server id 1  end_log_pos 2927 CRC32 XXX 	Delete_rows: table id 32 flags: STMT_END_F
+#<date> server id 1  end_log_pos 2927 CRC32 XXX 	Delete_rows: table id 31 flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -296,7 +296,7 @@ BEGIN
 #Q> DELETE FROM t2
 #<date> server id 1  end_log_pos 3135 CRC32 XXX 	Table_map: `test`.`t2` mapped to number num
 # at 3135
-#<date> server id 1  end_log_pos 3189 CRC32 XXX 	Delete_rows: table id 33 flags: STMT_END_F
+#<date> server id 1  end_log_pos 3189 CRC32 XXX 	Delete_rows: table id 32 flags: STMT_END_F
 ### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=10 /* INT meta=0 nullable=0 is_null=0 */
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 22d7a4dad56..1f9b4167656 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1223,6 +1223,26 @@ The following options may be given as the first argument:
  safe-replicable. Since 5.0, SYSDATE() returns a `dynamic'
  value different for different invocations, even within
  the same statement.
+ --system-versioning-alter-history=name 
+ Versioning ALTER TABLE mode. ERROR: Fail ALTER with
+ error; KEEP: Keep historical system rows and subject them
+ to ALTER; 
+ --system-versioning-force 
+ Force system versioning for all created tables
+ --system-versioning-hide=name 
+ Hide system versioning from being displayed in table
+ info. AUTO: hide implicit system fields only in
+ non-versioned and AS OF queries; IMPLICIT: hide implicit
+ system fields in all queries; FULL: hide any system
+ fields in all queries and hide versioning info in SHOW
+ commands; NEVER: don't hide system fields
+ --system-versioning-innodb-algorithm-simple 
+ Use simple algorithm of timestamp handling in InnoDB
+ instead of TRX_SEES
+ (Defaults to on; use --skip-system-versioning-innodb-algorithm-simple to disable.)
+ --system-versioning-transaction-registry 
+ Enable or disable update of
+ `mysql`.`transaction_registry`
  --table-cache=#     Deprecated; use --table-open-cache instead.
  --table-definition-cache=# 
  The number of cached table definitions
@@ -1310,9 +1330,6 @@ The following options may be given as the first argument:
  --transaction-read-only 
  Default transaction access mode. True if transactions are
  read-only.
- --transaction-registry 
- Enable or disable update of transaction_registry
- (Defaults to on; use --skip-transaction-registry to disable.)
  --updatable-views-with-limit=name 
  YES = Don't issue an error message (warning only) if a
  VIEW without presence of a key of the underlying table is
@@ -1330,22 +1347,6 @@ The following options may be given as the first argument:
  -v, --verbose       Used with --help option for detailed help.
  -V, --version[=name] 
  Output version information and exit.
- --versioning-alter-history=name 
- Versioning ALTER TABLE mode. ERROR: Fail ALTER with
- error; KEEP: Keep historical system rows and subject them
- to ALTER; 
- --versioning-force  Force system versioning for all created tables
- --versioning-hide=name 
- Hide system versioning from being displayed in table
- info. AUTO: hide implicit system fields only in
- non-versioned and AS OF queries; IMPLICIT: hide implicit
- system fields in all queries; FULL: hide any system
- fields in all queries and hide versioning info in SHOW
- commands; NEVER: don't hide system fields
- --versioning-innodb-algorithm-simple 
- Use simple algorithm of timestamp handling in InnoDB
- instead of TRX_SEES
- (Defaults to on; use --skip-versioning-innodb-algorithm-simple to disable.)
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
 
@@ -1671,6 +1672,11 @@ sync-master-info 10000
 sync-relay-log 10000
 sync-relay-log-info 10000
 sysdate-is-now FALSE
+system-versioning-alter-history ERROR
+system-versioning-force FALSE
+system-versioning-hide AUTO
+system-versioning-innodb-algorithm-simple TRUE
+system-versioning-transaction-registry FALSE
 table-cache 431
 table-definition-cache 400
 table-open-cache 431
@@ -1696,7 +1702,6 @@ transaction-alloc-block-size 8192
 transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096
 transaction-read-only FALSE
-transaction-registry TRUE
 updatable-views-with-limit YES
 use-stat-tables NEVER
 userstat FALSE
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 2c44ce9aa93..2a6df9b3d3c 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1212,7 +1212,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 execute my_stmt;
 COUNT(*)
 47
@@ -1220,7 +1219,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 execute my_stmt;
 COUNT(*)
 47
@@ -1228,7 +1226,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 deallocate prepare my_stmt;
 drop procedure if exists p1|
 drop table if exists t1|
diff --git a/mysql-test/suite/encryption/r/innodb_lotoftables.result b/mysql-test/suite/encryption/r/innodb_lotoftables.result
index 29b18e484ee..9dadf13f039 100644
--- a/mysql-test/suite/encryption/r/innodb_lotoftables.result
+++ b/mysql-test/suite/encryption/r/innodb_lotoftables.result
@@ -10,13 +10,13 @@ create database innodb_encrypted_1;
 use innodb_encrypted_1;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 set autocommit=0;
 set autocommit=1;
 commit work;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 # should be empty
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIKE 'innodb_encrypted%';
 NAME
@@ -24,13 +24,13 @@ create database innodb_encrypted_2;
 use innodb_encrypted_2;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 set autocommit=0;
 commit work;
 set autocommit=1;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 # should contain 100 tables
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
 NAME
@@ -141,13 +141,13 @@ create database innodb_encrypted_3;
 use innodb_encrypted_3;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 set autocommit=0;
 commit work;
 set autocommit=1;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 # should contain 100 tables
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
 NAME
@@ -357,7 +357,7 @@ innodb_encrypted_3/t_99
 use test;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
 NAME
 innodb_encrypted_2/t_1
@@ -770,53 +770,53 @@ innodb_encrypted_3/t_98
 innodb_encrypted_3/t_99
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	5
+Innodb_pages0_read	4
 # Success!
 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
 # Restart Success!
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use test;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_1;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_2;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_3;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_1;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_2;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 use innodb_encrypted_3;
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 show status like 'innodb_pages0_read%';
 Variable_name	Value
-Innodb_pages0_read	305
+Innodb_pages0_read	304
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
 NAME
 innodb_encrypted_3/t_1
diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result
index 6a9310bfa47..f1c784e2839 100644
--- a/mysql-test/suite/funcs_1/r/is_columns.result
+++ b/mysql-test/suite/funcs_1/r/is_columns.result
@@ -107,7 +107,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 ###############################################################################
 # Testcase 3.2.6.2 + 3.2.6.3: INFORMATION_SCHEMA.COLUMNS accessible information
 ###############################################################################
diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
index 1656415a7bc..f75513112e8 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
@@ -258,7 +258,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
@@ -284,7 +283,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
 DATA_TYPE,
@@ -306,7 +304,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
 DATA_TYPE,
@@ -329,7 +326,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
 --> are 0, which is intended behavior, and the result of 0 / 0 IS NULL
 SELECT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -602,4 +598,3 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result
index b1adf2c1058..419eb0b4b4c 100644
--- a/mysql-test/suite/funcs_1/r/is_statistics.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics.result
@@ -156,7 +156,6 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1286	Unknown storage engine 'InnoDB'
 ####################################################################################
 # Testcase 3.2.14.2 + 3.2.14.3: INFORMATION_SCHEMA.STATISTICS accessible information
 ####################################################################################
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result
index 795d302087f..ebc76b31f8b 100644
--- a/mysql-test/suite/innodb/r/instant_alter_debug.result
+++ b/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(*)
-1747
+1742
 SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete';
 ALTER TABLE t4 ADD COLUMN c INT;
 connect  dml,localhost,root,,;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index b4e449ab241..b40cb636e42 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -4071,6 +4071,90 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_ALTER_HISTORY
+SESSION_VALUE	ERROR
+GLOBAL_VALUE	ERROR
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	ERROR
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	ENUM
+VARIABLE_COMMENT	Versioning ALTER TABLE mode. ERROR: Fail ALTER with error; KEEP: Keep historical system rows and subject them to ALTER; 
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	ERROR,KEEP
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_ASOF
+SESSION_VALUE	DEFAULT
+GLOBAL_VALUE	DEFAULT
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	DEFAULT
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	Default value for the FOR SYSTEM_TIME AS OF clause
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	DEFAULT
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
+VARIABLE_NAME	SYSTEM_VERSIONING_FORCE
+SESSION_VALUE	OFF
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Force system versioning for all created tables
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	SYSTEM_VERSIONING_HIDE
+SESSION_VALUE	AUTO
+GLOBAL_VALUE	AUTO
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	AUTO
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	ENUM
+VARIABLE_COMMENT	Hide system versioning from being displayed in table info. AUTO: hide implicit system fields only in non-versioned and AS OF queries; IMPLICIT: hide implicit system fields in all queries; FULL: hide any system fields in all queries and hide versioning info in SHOW commands; NEVER: don't hide system fields
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	AUTO,IMPLICIT,FULL,NEVER
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_INNODB_ALGORITHM_SIMPLE
+SESSION_VALUE	ON
+GLOBAL_VALUE	ON
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	ON
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	SYSTEM_VERSIONING_TRANSACTION_REGISTRY
+SESSION_VALUE	NULL
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Enable or disable update of `mysql`.`transaction_registry`
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TABLE_DEFINITION_CACHE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	400
@@ -4351,20 +4435,6 @@ NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	TRANSACTION_REGISTRY
-SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Enable or disable update of transaction_registry
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TX_ISOLATION
 SESSION_VALUE	REPEATABLE-READ
 GLOBAL_VALUE	REPEATABLE-READ
@@ -4449,76 +4519,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NEVER,COMPLEMENTARY,PREFERABLY
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_ALTER_HISTORY
-SESSION_VALUE	ERROR
-GLOBAL_VALUE	ERROR
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ERROR
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Versioning ALTER TABLE mode. ERROR: Fail ALTER with error; KEEP: Keep historical system rows and subject them to ALTER; 
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	ERROR,KEEP
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_ASOF_TIMESTAMP
-SESSION_VALUE	CURRENT
-GLOBAL_VALUE	CURRENT
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	CURRENT
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Default AS OF value for versioned queries
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	CURRENT,ALL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	NULL
-VARIABLE_NAME	VERSIONING_FORCE
-SESSION_VALUE	OFF
-GLOBAL_VALUE	OFF
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Force system versioning for all created tables
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
-VARIABLE_NAME	VERSIONING_HIDE
-SESSION_VALUE	AUTO
-GLOBAL_VALUE	AUTO
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	AUTO
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Hide system versioning from being displayed in table info. AUTO: hide implicit system fields only in non-versioned and AS OF queries; IMPLICIT: hide implicit system fields in all queries; FULL: hide any system fields in all queries and hide versioning info in SHOW commands; NEVER: don't hide system fields
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	AUTO,IMPLICIT,FULL,NEVER
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_INNODB_ALGORITHM_SIMPLE
-SESSION_VALUE	ON
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	WAIT_TIMEOUT
 SESSION_VALUE	28800
 GLOBAL_VALUE	28800
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index eac6cbf4492..b2340e8df5f 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -5093,6 +5093,20 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	SYSTEM_VERSIONING_TRANSACTION_REGISTRY
+SESSION_VALUE	NULL
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Enable or disable update of `mysql`.`transaction_registry`
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TABLE_DEFINITION_CACHE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	400
@@ -5471,20 +5485,6 @@ NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	TRANSACTION_REGISTRY
-SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Enable or disable update of transaction_registry
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TX_ISOLATION
 SESSION_VALUE	REPEATABLE-READ
 GLOBAL_VALUE	REPEATABLE-READ