Scripts: VTMD_TEMPLATE removed [#286]

16 files changed, 3 insertions, 70 deletions

diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index 793c663be45..cb2da3505f5 100644
--- 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
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index 5ddb240d302..f36483e6d8d 100644
--- 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
diff --git a/mysql-test/r/ctype_upgrade.result b/mysql-test/r/ctype_upgrade.result
index 8c2e72e3084..5f0be66f8fb 100644
--- 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'
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 4f6318fd507..a4c287f54d8 100644
--- 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';
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result
index 2c03590655d..8f822d56020 100644
--- 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'
diff --git a/mysql-test/r/mysql_upgrade-6984.result b/mysql-test/r/mysql_upgrade-6984.result
index d73c6200fd0..6c711b4847f 100644
--- 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'
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index f56969182ee..5da7e3149ec 100644
--- 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` (
diff --git a/mysql-test/r/mysql_upgrade_no_innodb.result b/mysql-test/r/mysql_upgrade_no_innodb.result
index a9d5efd7670..8e051bb7c16 100644
--- 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'
diff --git a/mysql-test/r/mysql_upgrade_noengine.result b/mysql-test/r/mysql_upgrade_noengine.result
index f53dfd05b86..7b3b1610ee0 100644
--- 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
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result
index 54ce2b0e017..172a1401cdb 100644
--- 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'
diff --git a/mysql-test/r/mysql_upgrade_view.result b/mysql-test/r/mysql_upgrade_view.result
index 03903c1a38b..813138b57a8 100644
--- 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
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 300f9340b96..7259b68be50 100644
--- 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
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index 54fb47f2a93..3228a3d2782 100644
--- 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` (
diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/r/system_mysql_db_fix40123.result
index df81b8d81c9..c5115558a68 100644
--- 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` (
diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/r/system_mysql_db_fix50030.result
index b129a1bccbf..cbada2c333e 100644
--- 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` (
diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/r/system_mysql_db_fix50117.result
index df81b8d81c9..c5115558a68 100644
--- 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` (