Scripts: VTMD_TEMPLATE removed [#286]

d5e37621 · Aleksey Midenkov · 62b44b0e · 7e53ab36 · d5e37621 · d5e37621
Commit d5e37621 authored Dec 17, 2017 by Aleksey Midenkov
36 changed files
--- a/libmariadb @ 7e53ab36
+++ b/libmariadb @ 7e53ab36
-Subproject commit 63f841f78f520d7f3bcff1fe8cecec9d8c47829d
+Subproject commit 7e53ab369815590ff92913b581d43eb7786f2fe2
--- a/mysql-test/r/1st.result
+++ b/mysql-test/r/1st.result
@@ -38,4 +38,3 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -34,7 +34,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 connect  con2,localhost,root,,test;
 show tables;
 Tables_in_test
@@ -83,7 +82,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 connect  con4,localhost,test,gambling,test;
 show tables;
 Tables_in_test
@@ -144,7 +142,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 connect  con6,localhost,test,gambling3,test;
 show tables;
 Tables_in_test

--- a/mysql-test/r/ctype_upgrade.result
+++ b/mysql-test/r/ctype_upgrade.result
@@ -259,7 +259,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -319,7 +318,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'

--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -124,7 +124,6 @@ time_zone_transition_type
 transaction_registry
 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%";
@@ -1351,12 +1350,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)
-vtmd_template
+VIEWS
 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
-vtmd_template
+VIEWS
 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';

--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/r/log_tables_upgrade.result
@@ -44,7 +44,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'

--- a/mysql-test/r/mysql_upgrade-6984.result
+++ b/mysql-test/r/mysql_upgrade-6984.result
@@ -37,9 +37,6 @@ mysql.transaction_registry
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
 mysql.user                                         OK
-mysql.vtmd_template
-Error    : Unknown storage engine 'InnoDB'
-error    : Corrupt
 Repairing tables
 mysql.innodb_index_stats
@@ -51,9 +48,6 @@ error    : Corrupt
 mysql.transaction_registry
 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'

--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -32,7 +32,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -82,7 +81,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -132,7 +130,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -187,7 +184,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -243,7 +239,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -302,7 +297,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -356,7 +350,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -402,7 +395,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -469,7 +461,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -553,7 +544,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -572,7 +562,7 @@ OK
 # Should return 2
 SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
 count(*)
-4
+3
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

--- a/mysql-test/r/mysql_upgrade_no_innodb.result
+++ b/mysql-test/r/mysql_upgrade_no_innodb.result
@@ -37,9 +37,6 @@ mysql.transaction_registry
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
 mysql.user                                         OK
-mysql.vtmd_template
-Error    : Unknown storage engine 'InnoDB'
-error    : Corrupt
 Repairing tables
 mysql.innodb_index_stats
@@ -51,9 +48,6 @@ error    : Corrupt
 mysql.transaction_registry
 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'

--- a/mysql-test/r/mysql_upgrade_noengine.result
+++ b/mysql-test/r/mysql_upgrade_noengine.result
@@ -85,7 +85,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -175,7 +174,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'
@@ -265,7 +263,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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

--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/r/mysql_upgrade_ssl.result
@@ -33,7 +33,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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'

--- a/mysql-test/r/mysql_upgrade_view.result
+++ b/mysql-test/r/mysql_upgrade_view.result
@@ -101,9 +101,6 @@ mysql.transaction_registry
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
 mysql.user                                         OK
-mysql.vtmd_template
-Error    : Unknown storage engine 'InnoDB'
-error    : Corrupt
 Repairing tables
 mysql.innodb_index_stats
@@ -115,9 +112,6 @@ error    : Corrupt
 mysql.transaction_registry
 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
@@ -257,9 +251,6 @@ mysql.transaction_registry
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
 mysql.user                                         OK
-mysql.vtmd_template
-Error    : Unknown storage engine 'InnoDB'
-error    : Corrupt
 Repairing tables
 mysql.innodb_index_stats
@@ -271,9 +262,6 @@ error    : Corrupt
 mysql.transaction_registry
 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
@@ -388,9 +376,6 @@ mysql.transaction_registry
 Error    : Unknown storage engine 'InnoDB'
 error    : Corrupt
 mysql.user                                         OK
-mysql.vtmd_template
-Error    : Unknown storage engine 'InnoDB'
-error    : Corrupt
 Repairing tables
 mysql.innodb_index_stats
@@ -402,9 +387,6 @@ error    : Corrupt
 mysql.transaction_registry
 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

--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -33,7 +33,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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
@@ -71,10 +70,6 @@ mysql.transaction_registry
 note     : Table does not support optimize, doing recreate + analyze instead
 status   : OK
 mysql.user                                         OK
-mysql.vtmd_template
-note     : Table does not support optimize, doing recreate + analyze instead
-error    : Not allowed for versioned `mysql`.`vtmd_template`. Change `versioning_alter_history` to proceed with ALTER.
-status   : Operation failed
 mysql.column_stats                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
@@ -104,7 +99,6 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.transaction_registry                         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
@@ -140,10 +134,6 @@ mysql.transaction_registry
 note     : Table does not support optimize, doing recreate + analyze instead
 status   : OK
 mysql.user                                         Table is already up to date
-mysql.vtmd_template
-note     : Table does not support optimize, doing recreate + analyze instead
-error    : Not allowed for versioned `mysql`.`vtmd_template`. Change `versioning_alter_history` to proceed with ALTER.
-status   : Operation failed
 create table t1 (a int) engine=myisam;
 create view v1 as select * from t1;
 test.t1                                            OK
@@ -467,7 +457,6 @@ mysql.time_zone_transition                         Table is already up to date
 mysql.time_zone_transition_type                    Table is already up to date
 mysql.transaction_registry                         OK
 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

--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -31,7 +31,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (

--- a/mysql-test/r/system_mysql_db_fix40123.result
+++ b/mysql-test/r/system_mysql_db_fix40123.result
@@ -31,7 +31,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (

--- a/mysql-test/r/system_mysql_db_fix50030.result
+++ b/mysql-test/r/system_mysql_db_fix50030.result
@@ -31,7 +31,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (

--- a/mysql-test/r/system_mysql_db_fix50117.result
+++ b/mysql-test/r/system_mysql_db_fix50117.result
@@ -31,7 +31,6 @@ time_zone_transition
 time_zone_transition_type
 transaction_registry
 user
-vtmd_template
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (

--- a/mysql-test/suite/encryption/r/encrypt_and_grep.result
+++ b/mysql-test/suite/encryption/r/encrypt_and_grep.result
@@ -16,7 +16,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/t1
 test/t2
 innodb_system
@@ -36,13 +35,12 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/t2
 test/t3
+innodb_system
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 NAME
 test/t1
-innodb_system
 # t1 yes on expecting NOT FOUND
 NOT FOUND /foobarsecret/ in t1.ibd
 # t2 ... default expecting FOUND
@@ -62,7 +60,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/t1
 test/t2
 innodb_system

--- a/mysql-test/suite/encryption/r/innodb-spatial-index.result
+++ b/mysql-test/suite/encryption/r/innodb-spatial-index.result
@@ -39,7 +39,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/t1
 test/t2
 innodb_system

--- a/mysql-test/suite/encryption/r/innodb_encryption.result
+++ b/mysql-test/suite/encryption/r/innodb_encryption.result
@@ -15,7 +15,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 innodb_system
 # Success!
 # Now turn off encryption and wait for threads to decrypt everything
@@ -26,7 +25,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 innodb_system
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 NAME
@@ -42,7 +40,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 innodb_system
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 NAME
@@ -57,7 +54,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 innodb_system
 # Success!
 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
@@ -73,7 +69,6 @@ NAME
 mysql/innodb_table_stats
 mysql/innodb_index_stats
 mysql/transaction_registry
-mysql/vtmd_template
 innodb_system
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0;
 NAME
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
@@ -273,11 +273,6 @@ def	mysql	user	Update_priv	6	'N'	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci
 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	36	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
 def	mysql	user	x509_subject	37	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob			select,insert,update,references		NEVER	NULL
-def	mysql	vtmd_template	archive_name	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	MUL		select,insert,update,references	Name of archive table	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 mappings 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	name	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)			select,insert,update,references	Table name during current lifetime period	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
 ##########################################################################
@@ -621,8 +616,3 @@ 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)
-3.0000	mysql	vtmd_template	archive_name	varchar	64	192	utf8	utf8_bin	varchar(64)
-1.0000	mysql	vtmd_template	col_renames	blob	65535	65535	NULL	NULL	blob
--- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result
+++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result
@@ -146,7 +146,6 @@ def	mysql	commit_id	def	mysql	transaction_registry	commit_id
 def	mysql	PRIMARY	def	mysql	transaction_registry	transaction_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
 ########################################################################################

--- a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
@@ -146,7 +146,6 @@ def	mysql	commit_id	def	mysql	transaction_registry	commit_id
 def	mysql	PRIMARY	def	mysql	transaction_registry	transaction_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
 ########################################################################################

--- a/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
@@ -84,8 +84,6 @@ def	mysql	transaction_registry	1	mysql	commit_timestamp	2	transaction_id	A	#CARD
 def	mysql	transaction_registry	0	mysql	PRIMARY	1	transaction_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	1	mysql	archive_name	1	archive_name	A	#CARD#	NULL	NULL	YES	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'

--- a/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
@@ -84,8 +84,6 @@ def	mysql	transaction_registry	1	mysql	commit_timestamp	2	transaction_id	A	#CARD
 def	mysql	transaction_registry	0	mysql	PRIMARY	1	transaction_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	1	mysql	archive_name	1	archive_name	A	#CARD#	NULL	NULL	YES	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'
@@ -168,8 +166,6 @@ def	mysql	transaction_registry	1	mysql	commit_timestamp	2	transaction_id	A	#CARD
 def	mysql	transaction_registry	0	mysql	PRIMARY	1	transaction_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	1	mysql	archive_name	1	archive_name	A	#CARD#	NULL	NULL	YES	BTREE		
-def	mysql	vtmd_template	0	mysql	PRIMARY	1	end	A	#CARD#	NULL	NULL		BTREE		
 connection default;
 disconnect testuser1;
 DROP USER testuser1@localhost;

--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -91,7 +91,6 @@ def	mysql	PRIMARY	mysql	time_zone_transition_type
 def	mysql	commit_id	mysql	transaction_registry
 def	mysql	PRIMARY	mysql	transaction_registry
 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
 #########################################################################################

--- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
@@ -40,7 +40,6 @@ def	mysql	PRIMARY	mysql	time_zone_transition_type	PRIMARY KEY
 def	mysql	commit_id	mysql	transaction_registry	UNIQUE
 def	mysql	PRIMARY	mysql	transaction_registry	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'

--- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
@@ -40,7 +40,6 @@ def	mysql	PRIMARY	mysql	time_zone_transition_type	PRIMARY KEY
 def	mysql	commit_id	mysql	transaction_registry	UNIQUE
 def	mysql	PRIMARY	mysql	transaction_registry	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'
@@ -79,7 +78,6 @@ def	mysql	PRIMARY	mysql	time_zone_transition_type	PRIMARY KEY
 def	mysql	commit_id	mysql	transaction_registry	UNIQUE
 def	mysql	PRIMARY	mysql	transaction_registry	PRIMARY KEY
 def	mysql	PRIMARY	mysql	user	PRIMARY KEY
-def	mysql	PRIMARY	mysql	vtmd_template	PRIMARY KEY
 connection default;
 disconnect testuser1;
 DROP USER testuser1@localhost;

--- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result
@@ -723,29 +723,6 @@ 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;

--- a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
@@ -723,29 +723,6 @@ 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;
@@ -1473,29 +1450,6 @@ 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	-----------------------------------------------------
 connection default;
 disconnect testuser1;
 DROP USER testuser1@localhost;

--- a/mysql-test/suite/innodb/r/innodb-index-online-fk.result
+++ b/mysql-test/suite/innodb/r/innodb-index-online-fk.result
@@ -127,7 +127,6 @@ SYS_VIRTUAL
 mysql/innodb_index_stats
 mysql/innodb_table_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/child
 test/parent
 INSERT INTO child VALUES(5,4);
@@ -320,7 +319,6 @@ SYS_VIRTUAL
 mysql/innodb_index_stats
 mysql/innodb_table_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/child
 test/parent
 ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT,
@@ -347,7 +345,6 @@ SYS_VIRTUAL
 mysql/innodb_index_stats
 mysql/innodb_table_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;
@@ -385,7 +382,6 @@ SYS_VIRTUAL
 mysql/innodb_index_stats
 mysql/innodb_table_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;
@@ -423,7 +419,6 @@ SYS_VIRTUAL
 mysql/innodb_index_stats
 mysql/innodb_table_stats
 mysql/transaction_registry
-mysql/vtmd_template
 test/child
 test/parent
 SHOW CREATE TABLE child;

--- a/mysql-test/suite/innodb_zip/r/16k.result
+++ b/mysql-test/suite/innodb_zip/r/16k.result
@@ -22,8 +22,6 @@ mysql/transaction_registry	8	33	PRIMARY	3	3	1	50
 mysql/transaction_registry	8	33	commit_id	4	2	1	50
 mysql/transaction_registry	8	33	begin_timestamp	5	0	1	50
 mysql/transaction_registry	8	33	commit_timestamp	6	0	2	50
-mysql/vtmd_template	8	33	PRIMARY	3	3	1	50
-mysql/vtmd_template	8	33	archive_name	4	0	1	50
 CREATE TABLE t1 (a INT KEY, b TEXT) ROW_FORMAT=REDUNDANT ENGINE=innodb;
 CREATE TABLE t2 (a INT KEY, b TEXT) ROW_FORMAT=COMPACT ENGINE=innodb;
 CREATE TABLE t3 (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb;

--- 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, transaction_registry, vtmd_template, 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, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 -- enable_query_log

--- 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, transaction_registry, vtmd_template, 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, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 -- enable_query_log

--- 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, transaction_registry, vtmd_template, 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, transaction_registry, table_stats, column_stats, index_stats, roles_mapping, gtid_slave_pos;
 -- enable_query_log

--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -144,17 +144,6 @@ SET @create_transaction_registry="CREATE TABLE IF NOT EXISTS transaction_registr
 	INDEX (commit_timestamp, transaction_id)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0";
-SET @create_vtmd_template="CREATE OR REPLACE TABLE 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 current lifetime period',
-	archive_name	VARCHAR(64) NULL				COMMENT 'Name of archive table',
-	col_renames	BLOB						COMMENT 'Column name mappings from previous lifetime',
-	PERIOD FOR SYSTEM_TIME(start, end),
-	PRIMARY KEY (end),
-	INDEX (archive_name)
-) 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;
@@ -170,11 +159,6 @@ 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.',