Scripts: VTMD table [closes #122]

41 files changed, 173 insertions, 27 deletions

diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index f9e4b37aa94..1c4000c9a6a 100644
--- a/mysql-test/r/1st.result
+++ b/mysql-test/r/1st.result
@@ -37,3 +37,4 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index dfe4406605e..e3e2e4db39c 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -33,6 +33,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 connect  con2,localhost,root,,test;
 show tables;
 Tables_in_test
@@ -80,6 +81,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 connect  con4,localhost,test,gambling,test;
 show tables;
 Tables_in_test
@@ -139,6 +141,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 connect  con6,localhost,test,gambling3,test;
 show tables;
 Tables_in_test
diff --git a/mysql-test/r/ctype_upgrade.result b/mysql-test/r/ctype_upgrade.result
index 53cb858035b..e56cfaa617d 100644
--- a/mysql-test/r/ctype_upgrade.result
+++ b/mysql-test/r/ctype_upgrade.result
@@ -258,6 +258,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -316,6 +317,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result
index e986b486bf2..1de3894e278 100644
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/r/derived_view.result
@@ -2310,6 +2310,8 @@ 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.result b/mysql-test/r/information_schema.result
index dad6d5d8c8a..6a6b5e0616a 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -123,6 +123,7 @@ time_zone_transition
 time_zone_transition_type
 user
 v1
+vtmd_template
 select c,table_name from v1 
 inner join information_schema.TABLES v2 on (v1.c=v2.table_name)
 where v1.c like "t%";
@@ -1334,12 +1335,12 @@ DROP PROCEDURE p1;
 DROP USER mysql_bug20230@localhost;
 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test') and table_name not like 'xtradb%';
 MAX(table_name)
-VIEWS
+vtmd_template
 SELECT table_name from information_schema.tables
 WHERE table_name=(SELECT MAX(table_name)
 FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test') and table_name not like 'xtradb%');
 table_name
-VIEWS
+vtmd_template
 DROP TABLE IF EXISTS bug23037;
 DROP FUNCTION IF EXISTS get_value;
 SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index 126a6f4bccd..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	30
+mysql	31
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index be497475f4d..00b62ca44d0 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -762,6 +762,7 @@ user	User	def	mysql	0	mysql	PRIMARY	2	A	NULL	NULL		BTREE		def	mysql		NO	char	80
 Warnings:
 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/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result
index a56d067c2cd..a8352824aa4 100644
--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/r/log_tables_upgrade.result
@@ -43,6 +43,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
diff --git a/mysql-test/r/mysql_upgrade-6984.result b/mysql-test/r/mysql_upgrade-6984.result
index 59c9a865b7c..2b995ad5364 100644
--- a/mysql-test/r/mysql_upgrade-6984.result
+++ b/mysql-test/r/mysql_upgrade-6984.result
@@ -34,6 +34,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 
 Repairing tables
 mysql.innodb_index_stats
@@ -42,6 +45,9 @@ error    : Corrupt
 mysql.innodb_table_stats
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index a337a939acc..194a118f0e4 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -31,6 +31,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -79,6 +80,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -127,6 +129,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -180,6 +183,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -234,6 +238,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -291,6 +296,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -343,6 +349,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views... Skipped
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -387,6 +394,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -452,6 +460,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -511,6 +520,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -529,7 +539,7 @@ OK
 # Should return 2
 SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
 count(*)
-2
+3
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/mysql_upgrade_no_innodb.result b/mysql-test/r/mysql_upgrade_no_innodb.result
index 6ad818278f8..22e88e27775 100644
--- a/mysql-test/r/mysql_upgrade_no_innodb.result
+++ b/mysql-test/r/mysql_upgrade_no_innodb.result
@@ -34,6 +34,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 
 Repairing tables
 mysql.innodb_index_stats
@@ -42,6 +45,9 @@ error    : Corrupt
 mysql.innodb_table_stats
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views... Skipped
 Phase 4/7: Running 'mysql_fix_privilege_tables'
diff --git a/mysql-test/r/mysql_upgrade_noengine.result b/mysql-test/r/mysql_upgrade_noengine.result
index 09e705abb69..582147d09df 100644
--- a/mysql-test/r/mysql_upgrade_noengine.result
+++ b/mysql-test/r/mysql_upgrade_noengine.result
@@ -81,6 +81,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -167,6 +168,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
@@ -253,6 +255,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Upgrading from a version before MariaDB-10.1
 Phase 2/7: Installing used storage engines
 Checking for tables with unknown storage engine
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result
index 918a24ffc71..0285d4ac095 100644
--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -32,6 +32,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 Phase 4/7: Running 'mysql_fix_privilege_tables'
diff --git a/mysql-test/r/mysql_upgrade_view.result b/mysql-test/r/mysql_upgrade_view.result
index dc31592566a..0092a772bf9 100644
--- a/mysql-test/r/mysql_upgrade_view.result
+++ b/mysql-test/r/mysql_upgrade_view.result
@@ -98,6 +98,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 
 Repairing tables
 mysql.innodb_index_stats
@@ -106,6 +109,9 @@ error    : Corrupt
 mysql.innodb_table_stats
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views
 test.v1                                            OK
@@ -242,6 +248,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 
 Repairing tables
 mysql.innodb_index_stats
@@ -250,6 +259,9 @@ error    : Corrupt
 mysql.innodb_table_stats
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views from mysql
 test.v1                                            OK
@@ -361,6 +373,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 
 Repairing tables
 mysql.innodb_index_stats
@@ -369,6 +384,9 @@ error    : Corrupt
 mysql.innodb_table_stats
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
+mysql.vtmd_template
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
 Phase 2/7: Installing used storage engines... Skipped
 Phase 3/7: Fixing views from mysql
 test.v1                                            OK
diff --git a/mysql-test/r/mysqlbinlog_row_compressed.result b/mysql-test/r/mysqlbinlog_row_compressed.result
index 24fff723ec8..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 30 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 30 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 30 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 30 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 31 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 31 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 30 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 31 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 ca8e43bfb33..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 30 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 30 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 30 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 30 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 31 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 31 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 30 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 31 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/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index ff9cc5d5c81..a2967bd5e5b 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -32,6 +32,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 mtr.global_suppressions                            Table is already up to date
 mtr.test_suppressions                              Table is already up to date
 mysql.column_stats                                 OK
@@ -66,6 +67,9 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template
+note     : Table does not support optimize, doing recreate + analyze instead
+status   : OK
 mysql.column_stats                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
@@ -94,6 +98,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
+mysql.vtmd_template                                OK
 mysql.column_stats                                 Table is already up to date
 mysql.columns_priv                                 Table is already up to date
 mysql.db                                           Table is already up to date
@@ -126,6 +131,9 @@ mysql.time_zone_name                               Table is already up to date
 mysql.time_zone_transition                         Table is already up to date
 mysql.time_zone_transition_type                    Table is already up to date
 mysql.user                                         Table is already up to date
+mysql.vtmd_template
+note     : Table does not support optimize, doing recreate + analyze instead
+status   : OK
 create table t1 (a int) engine=myisam;
 create view v1 as select * from t1;
 test.t1                                            OK
@@ -448,6 +456,7 @@ mysql.time_zone_name                               Table is already up to date
 mysql.time_zone_transition                         Table is already up to date
 mysql.time_zone_transition_type                    Table is already up to date
 mysql.user                                         Table is already up to date
+mysql.vtmd_template                                OK
 mysqltest1.t1
 warning  : Table is marked as crashed
 warning  : Size of datafile is: 4       Should be: 0
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 567be0d0d3f..317ba5a3283 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1211,18 +1211,21 @@ COUNT(*)
 Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1286	Unknown storage engine 'InnoDB'
 execute my_stmt;
 COUNT(*)
 46
 Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1286	Unknown storage engine 'InnoDB'
 execute my_stmt;
 COUNT(*)
 46
 Warnings:
 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/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index b88497dbd9b..558b552e2fd 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -30,6 +30,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/r/system_mysql_db_fix40123.result
index b88497dbd9b..558b552e2fd 100644
--- a/mysql-test/r/system_mysql_db_fix40123.result
+++ b/mysql-test/r/system_mysql_db_fix40123.result
@@ -30,6 +30,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/r/system_mysql_db_fix50030.result
index 14905ab81a0..17252b09912 100644
--- a/mysql-test/r/system_mysql_db_fix50030.result
+++ b/mysql-test/r/system_mysql_db_fix50030.result
@@ -30,6 +30,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/r/system_mysql_db_fix50117.result
index b88497dbd9b..558b552e2fd 100644
--- a/mysql-test/r/system_mysql_db_fix50117.result
+++ b/mysql-test/r/system_mysql_db_fix50117.result
@@ -30,6 +30,7 @@ time_zone_name
 time_zone_transition
 time_zone_transition_type
 user
+vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
diff --git a/mysql-test/suite/encryption/r/encrypt_and_grep.result b/mysql-test/suite/encryption/r/encrypt_and_grep.result
index b1ffbdb8134..1b468baf6bc 100644
--- a/mysql-test/suite/encryption/r/encrypt_and_grep.result
+++ b/mysql-test/suite/encryption/r/encrypt_and_grep.result
@@ -13,6 +13,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
+mysql/vtmd_template
 test/t1
 test/t2
 innodb_system
@@ -32,12 +33,13 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
-test/t2
+mysql/vtmd_template
 test/t3
 innodb_system
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 NAME
 test/t1
+test/t2
 # t1 yes on expecting NOT FOUND
 NOT FOUND /foobar/ in t1.ibd
 # t2 ... on expecting FOUND
@@ -57,6 +59,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
+mysql/vtmd_template
 test/t1
 test/t2
 innodb_system
diff --git a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result
index feaede20f2a..7b8454aaa86 100644
--- a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result
+++ b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result
@@ -4,6 +4,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
+mysql/vtmd_template
 innodb_system
 create database enctests;
 use enctests;
diff --git a/mysql-test/suite/encryption/r/innodb-spatial-index.result b/mysql-test/suite/encryption/r/innodb-spatial-index.result
index 852be0b9a73..f214355718d 100644
--- a/mysql-test/suite/encryption/r/innodb-spatial-index.result
+++ b/mysql-test/suite/encryption/r/innodb-spatial-index.result
@@ -34,6 +34,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
+mysql/vtmd_template
 test/t1
 test/t2
 innodb_system
diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
index 5001ac6a516..edc8745b5f6 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.test
+++ b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -8,13 +8,13 @@ if (`select count(*) = 0 from information_schema.plugins
 set global innodb_encrypt_tables=ON;
 show variables like 'innodb_encrypt%';
 
-let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
+let $wait_condition= select count(*) = 4 from information_schema.innodb_tablespaces_encryption where current_key_version=1;
 --source include/wait_condition.inc
 
 select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1;
 set global debug_key_management_version=10;
 
-let $wait_condition= select count(*) = 3 from information_schema.innodb_tablespaces_encryption where current_key_version=10;
+let $wait_condition= select count(*) = 4 from information_schema.innodb_tablespaces_encryption where current_key_version=10;
 --source include/wait_condition.inc
 
 select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
diff --git a/mysql-test/suite/encryption/t/encrypt_and_grep.test b/mysql-test/suite/encryption/t/encrypt_and_grep.test
index 2ef69db237d..37ebf97f3eb 100644
--- a/mysql-test/suite/encryption/t/encrypt_and_grep.test
+++ b/mysql-test/suite/encryption/t/encrypt_and_grep.test
@@ -26,7 +26,7 @@ insert t3 values (repeat('dummy', 42));
 
 --echo # Wait max 10 min for key encryption threads to encrypt all spaces
 --let $wait_timeout= 600
---let $wait_condition=SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0
+--let $wait_condition=SELECT COUNT(*) <= 2 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0
 --source include/wait_condition.inc
 
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0;
diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result
index 26a8677495b..62b0bce8ede 100644
--- a/mysql-test/suite/funcs_1/r/is_columns.result
+++ b/mysql-test/suite/funcs_1/r/is_columns.result
@@ -106,6 +106,7 @@ table_catalog	table_schema	table_name	column_name
 Warnings:
 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.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
index b12574a0dc4..f51c4bfb089 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
@@ -265,6 +265,11 @@ def	mysql	user	Update_priv	6	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	e
 def	mysql	user	User	2		NO	char	80	240	NULL	NULL	NULL	utf8	utf8_bin	char(80)	PRI		select,insert,update,references		NEVER	NULL
 def	mysql	user	x509_issuer	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
 def	mysql	user	x509_subject	36	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
+def	mysql	vtmd_template	col_renames	5	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references	Column name mapping from previous lifetime	NEVER	NULL
+def	mysql	vtmd_template	end	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	TRX_ID of table lifetime end	NEVER	NULL
+def	mysql	vtmd_template	frm_image	4	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references	Table structure during period [start, end)	NEVER	NULL
+def	mysql	vtmd_template	name	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)			select,insert,update,references	Table name during period [start, end)	NEVER	NULL
+def	mysql	vtmd_template	start	1	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references	TRX_ID of table lifetime start	NEVER	NULL
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
@@ -600,3 +605,8 @@ NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11)
 3.0000	mysql	user	is_role	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	default_role	char	80	240	utf8	utf8_bin	char(80)
 NULL	mysql	user	max_statement_time	decimal	NULL	NULL	NULL	NULL	decimal(12,6)
+NULL	mysql	vtmd_template	start	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	vtmd_template	end	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+3.0000	mysql	vtmd_template	name	varchar	64	192	utf8	utf8_bin	varchar(64)
+1.0000	mysql	vtmd_template	frm_image	blob	65535	65535	NULL	NULL	blob
+1.0000	mysql	vtmd_template	col_renames	blob	65535	65535	NULL	NULL	blob
diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result
index 80dd2db5441..b90083b6587 100644
--- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result
+++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result
@@ -143,6 +143,7 @@ def	mysql	PRIMARY	def	mysql	time_zone_transition_type	Time_zone_id
 def	mysql	PRIMARY	def	mysql	time_zone_transition_type	Transition_type_id
 def	mysql	PRIMARY	def	mysql	user	Host
 def	mysql	PRIMARY	def	mysql	user	User
+def	mysql	PRIMARY	def	mysql	vtmd_template	end
 ########################################################################################
 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information
 ########################################################################################
diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result
index 749b09fa87d..8f82c04e3da 100644
--- a/mysql-test/suite/funcs_1/r/is_statistics.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics.result
@@ -154,6 +154,7 @@ def	mysql	user	mysql	PRIMARY
 Warnings:
 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/funcs_1/r/is_statistics_mysql.result b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
index dc3ed5f9839..332d85ffbcd 100644
--- a/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
@@ -79,6 +79,7 @@ def	mysql	time_zone_transition_type	0	mysql	PRIMARY	1	Time_zone_id	A	#CARD#	NULL
 def	mysql	time_zone_transition_type	0	mysql	PRIMARY	2	Transition_type_id	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	user	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	user	0	mysql	PRIMARY	2	User	A	#CARD#	NULL	NULL		BTREE		
+def	mysql	vtmd_template	0	mysql	PRIMARY	1	end	A	#CARD#	NULL	NULL		BTREE		
 connect  testuser1,localhost,testuser1,,db_datadict;
 SELECT * FROM information_schema.statistics
 WHERE table_schema = 'mysql'
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result
index 37fcce5ae42..9637f24959e 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -88,6 +88,7 @@ def	mysql	PRIMARY	mysql	time_zone_name
 def	mysql	PRIMARY	mysql	time_zone_transition
 def	mysql	PRIMARY	mysql	time_zone_transition_type
 def	mysql	PRIMARY	mysql	user
+def	mysql	PRIMARY	mysql	vtmd_template
 #########################################################################################
 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.TABLE_CONSTRAINTS accessible information
 #########################################################################################
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
index e54de0671a2..9998f99ab1b 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
@@ -38,6 +38,7 @@ def	mysql	PRIMARY	mysql	time_zone_name	PRIMARY KEY
 def	mysql	PRIMARY	mysql	time_zone_transition	PRIMARY KEY
 def	mysql	PRIMARY	mysql	time_zone_transition_type	PRIMARY KEY
 def	mysql	PRIMARY	mysql	user	PRIMARY KEY
+def	mysql	PRIMARY	mysql	vtmd_template	PRIMARY KEY
 connect  testuser1,localhost,testuser1,,db_datadict;
 SELECT * FROM information_schema.table_constraints
 WHERE table_schema = 'mysql'
diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result
index 8e0c9b64dab..704bb51f70a 100644
--- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result
@@ -700,6 +700,29 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	#TC#
 user_comment	Users and global privileges
 Separator	-----------------------------------------------------
+TABLE_CATALOG	def
+TABLE_SCHEMA	mysql
+TABLE_NAME	vtmd_template
+TABLE_TYPE	BASE TABLE
+ENGINE	InnoDB
+VERSION	10
+ROW_FORMAT	DYNAMIC_OR_PAGE
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
 DROP   USER testuser1@localhost;
 CREATE USER testuser1@localhost;
 GRANT SELECT ON test1.* TO testuser1@localhost;
diff --git a/mysql-test/suite/versioning/r/ddl.result b/mysql-test/suite/versioning/r/ddl.result
index 80f8469d015..415d6c54feb 100644
--- a/mysql-test/suite/versioning/r/ddl.result
+++ b/mysql-test/suite/versioning/r/ddl.result
@@ -161,6 +161,19 @@ drop procedure concat_exec2;
 drop procedure concat_exec3;
 drop function get_historical_table_name;
 drop procedure drop_last_historical;
+select * from mysql.vtmd_template;
+start	end	name	frm_image	col_renames
+show create table mysql.vtmd_template;
+Table	Create Table
+vtmd_template	CREATE TABLE `vtmd_template` (
+  `start` bigint(20) unsigned GENERATED ALWAYS AS ROW START COMMENT 'TRX_ID of table lifetime start',
+  `end` bigint(20) unsigned NOT NULL GENERATED ALWAYS AS ROW END COMMENT 'TRX_ID of table lifetime end',
+  `name` varchar(64) COLLATE utf8_bin NOT NULL COMMENT 'Table name during period [start, end)',
+  `frm_image` blob NOT NULL COMMENT 'Table structure during period [start, end)',
+  `col_renames` blob DEFAULT NULL COMMENT 'Column name mapping from previous lifetime',
+  PRIMARY KEY (`end`),
+  PERIOD FOR SYSTEM_TIME (`start`, `end`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 WITH SYSTEM VERSIONING
 call verify_vtq;
 No	A	B	C	D
 1	1	1	1	1
diff --git a/mysql-test/suite/versioning/t/ddl.test b/mysql-test/suite/versioning/t/ddl.test
index 7d919209bcd..43c0d588a4f 100644
--- a/mysql-test/suite/versioning/t/ddl.test
+++ b/mysql-test/suite/versioning/t/ddl.test
@@ -98,6 +98,9 @@ drop procedure concat_exec3;
 drop function get_historical_table_name;
 drop procedure drop_last_historical;
 
+select * from mysql.vtmd_template;
+show create table mysql.vtmd_template;
+
 call verify_vtq;
 drop table t;
 
diff --git a/mysql-test/t/system_mysql_db_fix40123.test b/mysql-test/t/system_mysql_db_fix40123.test
index fd1212d4ce6..e21f52c7726 100644
--- a/mysql-test/t/system_mysql_db_fix40123.test
+++ b/mysql-test/t/system_mysql_db_fix40123.test
@@ -72,7 +72,7 @@ CREATE TABLE time_zone_leap_second (   Transition_time bigint signed NOT NULL,
 -- disable_query_log
 
 # Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, vtmd_template, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 
 -- enable_query_log
 
diff --git a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/t/system_mysql_db_fix50030.test
index c3e7dd7b9b1..9c7d4f9f10e 100644
--- a/mysql-test/t/system_mysql_db_fix50030.test
+++ b/mysql-test/t/system_mysql_db_fix50030.test
@@ -79,7 +79,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r
 -- disable_query_log
 
 # Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, vtmd_template, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 
 -- enable_query_log
 
diff --git a/mysql-test/t/system_mysql_db_fix50117.test b/mysql-test/t/system_mysql_db_fix50117.test
index dcc765ae132..561a2040160 100644
--- a/mysql-test/t/system_mysql_db_fix50117.test
+++ b/mysql-test/t/system_mysql_db_fix50117.test
@@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_b
 -- disable_query_log
 
 # Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, proxies_priv, innodb_index_stats, innodb_table_stats, vtmd_template, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 
 -- enable_query_log
 
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 7b614163f46..51e324386c3 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -129,6 +129,16 @@ SET @create_innodb_index_stats="CREATE TABLE IF NOT EXISTS innodb_index_stats (
 	PRIMARY KEY (database_name, table_name, index_name, stat_name)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0";
 
+SET @create_vtmd_template="CREATE TABLE IF NOT EXISTS vtmd_template (
+	start		BIGINT UNSIGNED GENERATED ALWAYS AS ROW START	COMMENT 'TRX_ID of table lifetime start',
+	end		BIGINT UNSIGNED GENERATED ALWAYS AS ROW END	COMMENT 'TRX_ID of table lifetime end',
+	name		VARCHAR(64) NOT NULL				COMMENT 'Table name during period [start, end)',
+	frm_image	BLOB NOT NULL					COMMENT 'Table structure during period [start, end)',
+	col_renames	BLOB						COMMENT 'Column name mapping from previous lifetime',
+	PERIOD FOR SYSTEM_TIME(start, end),
+	PRIMARY KEY (end)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0 WITH SYSTEM VERSIONING";
+
 SET @str=IF(@have_innodb <> 0, @create_innodb_table_stats, "SET @dummy = 0");
 PREPARE stmt FROM @str;
 EXECUTE stmt;
@@ -139,6 +149,11 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
+SET @str=IF(@have_innodb <> 0, @create_vtmd_template, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
 SET @cmd="CREATE TABLE IF NOT EXISTS slave_relay_log_info (
   Number_of_lines INTEGER UNSIGNED NOT NULL COMMENT 'Number of lines in the file or rows in the table. Used to version table definitions.', 
   Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the current relay log file.',