Commit 45f6acd2 authored by kevg's avatar kevg Committed by Aleksey Midenkov

Scripts: VTMD table [closes #122]

parent abba11e6
...@@ -37,3 +37,4 @@ time_zone_name ...@@ -37,3 +37,4 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
...@@ -33,6 +33,7 @@ time_zone_name ...@@ -33,6 +33,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
connect con2,localhost,root,,test; connect con2,localhost,root,,test;
show tables; show tables;
Tables_in_test Tables_in_test
...@@ -80,6 +81,7 @@ time_zone_name ...@@ -80,6 +81,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
connect con4,localhost,test,gambling,test; connect con4,localhost,test,gambling,test;
show tables; show tables;
Tables_in_test Tables_in_test
...@@ -139,6 +141,7 @@ time_zone_name ...@@ -139,6 +141,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
connect con6,localhost,test,gambling3,test; connect con6,localhost,test,gambling3,test;
show tables; show tables;
Tables_in_test Tables_in_test
......
...@@ -258,6 +258,7 @@ mysql.time_zone_name OK ...@@ -258,6 +258,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -316,6 +317,7 @@ mysql.time_zone_name OK ...@@ -316,6 +317,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
......
...@@ -2310,6 +2310,8 @@ Warning 1286 Unknown storage engine 'InnoDB' ...@@ -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' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
DROP TABLE t1; DROP TABLE t1;
SET SESSION optimizer_switch= @save_optimizer_switch; SET SESSION optimizer_switch= @save_optimizer_switch;
# #
......
...@@ -123,6 +123,7 @@ time_zone_transition ...@@ -123,6 +123,7 @@ time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
v1 v1
vtmd_template
select c,table_name from v1 select c,table_name from v1
inner join information_schema.TABLES v2 on (v1.c=v2.table_name) inner join information_schema.TABLES v2 on (v1.c=v2.table_name)
where v1.c like "t%"; where v1.c like "t%";
...@@ -1334,12 +1335,12 @@ DROP PROCEDURE p1; ...@@ -1334,12 +1335,12 @@ DROP PROCEDURE p1;
DROP USER mysql_bug20230@localhost; 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%'; 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) MAX(table_name)
VIEWS vtmd_template
SELECT table_name from information_schema.tables SELECT table_name from information_schema.tables
WHERE table_name=(SELECT MAX(table_name) 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%'); FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test') and table_name not like 'xtradb%');
table_name table_name
VIEWS vtmd_template
DROP TABLE IF EXISTS bug23037; DROP TABLE IF EXISTS bug23037;
DROP FUNCTION IF EXISTS get_value; DROP FUNCTION IF EXISTS get_value;
SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037'; SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
......
...@@ -454,4 +454,4 @@ Wildcard: inf_rmation_schema ...@@ -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; SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') GROUP BY TABLE_SCHEMA;
table_schema count(*) table_schema count(*)
information_schema 64 information_schema 64
mysql 30 mysql 31
...@@ -762,6 +762,7 @@ user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql NO char 80 ...@@ -762,6 +762,7 @@ user User def mysql 0 mysql PRIMARY 2 A NULL NULL BTREE def mysql NO char 80
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
drop table t1; drop table t1;
drop table t2; drop table t2;
drop table t3; drop table t3;
......
...@@ -43,6 +43,7 @@ mysql.time_zone_name OK ...@@ -43,6 +43,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
......
...@@ -34,6 +34,9 @@ mysql.time_zone_name OK ...@@ -34,6 +34,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Repairing tables Repairing tables
mysql.innodb_index_stats mysql.innodb_index_stats
...@@ -42,6 +45,9 @@ error : Corrupt ...@@ -42,6 +45,9 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
......
...@@ -31,6 +31,7 @@ mysql.time_zone_name OK ...@@ -31,6 +31,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -79,6 +80,7 @@ mysql.time_zone_name OK ...@@ -79,6 +80,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -127,6 +129,7 @@ mysql.time_zone_name OK ...@@ -127,6 +129,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -180,6 +183,7 @@ mysql.time_zone_name OK ...@@ -180,6 +183,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -234,6 +238,7 @@ mysql.time_zone_name OK ...@@ -234,6 +238,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -291,6 +296,7 @@ mysql.time_zone_name OK ...@@ -291,6 +296,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -343,6 +349,7 @@ mysql.time_zone_name OK ...@@ -343,6 +349,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views... Skipped Phase 3/7: Fixing views... Skipped
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -387,6 +394,7 @@ mysql.time_zone_name OK ...@@ -387,6 +394,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -452,6 +460,7 @@ mysql.time_zone_name OK ...@@ -452,6 +460,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -511,6 +520,7 @@ mysql.time_zone_name OK ...@@ -511,6 +520,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -529,7 +539,7 @@ OK ...@@ -529,7 +539,7 @@ OK
# Should return 2 # Should return 2
SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB"; SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
count(*) count(*)
2 3
SHOW CREATE TABLE test.t1; SHOW CREATE TABLE test.t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
......
...@@ -34,6 +34,9 @@ mysql.time_zone_name OK ...@@ -34,6 +34,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Repairing tables Repairing tables
mysql.innodb_index_stats mysql.innodb_index_stats
...@@ -42,6 +45,9 @@ error : Corrupt ...@@ -42,6 +45,9 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views... Skipped Phase 3/7: Fixing views... Skipped
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
......
...@@ -81,6 +81,7 @@ mysql.time_zone_name OK ...@@ -81,6 +81,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -167,6 +168,7 @@ mysql.time_zone_name OK ...@@ -167,6 +168,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
...@@ -253,6 +255,7 @@ mysql.time_zone_name OK ...@@ -253,6 +255,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Upgrading from a version before MariaDB-10.1 Upgrading from a version before MariaDB-10.1
Phase 2/7: Installing used storage engines Phase 2/7: Installing used storage engines
Checking for tables with unknown storage engine Checking for tables with unknown storage engine
......
...@@ -32,6 +32,7 @@ mysql.time_zone_name OK ...@@ -32,6 +32,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
......
...@@ -98,6 +98,9 @@ mysql.time_zone_name OK ...@@ -98,6 +98,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Repairing tables Repairing tables
mysql.innodb_index_stats mysql.innodb_index_stats
...@@ -106,6 +109,9 @@ error : Corrupt ...@@ -106,6 +109,9 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
test.v1 OK test.v1 OK
...@@ -242,6 +248,9 @@ mysql.time_zone_name OK ...@@ -242,6 +248,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Repairing tables Repairing tables
mysql.innodb_index_stats mysql.innodb_index_stats
...@@ -250,6 +259,9 @@ error : Corrupt ...@@ -250,6 +259,9 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql Phase 3/7: Fixing views from mysql
test.v1 OK test.v1 OK
...@@ -361,6 +373,9 @@ mysql.time_zone_name OK ...@@ -361,6 +373,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Repairing tables Repairing tables
mysql.innodb_index_stats mysql.innodb_index_stats
...@@ -369,6 +384,9 @@ error : Corrupt ...@@ -369,6 +384,9 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
mysql.vtmd_template
Error : Unknown storage engine 'InnoDB'
error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql Phase 3/7: Fixing views from mysql
test.v1 OK test.v1 OK
......
...@@ -61,7 +61,7 @@ BEGIN ...@@ -61,7 +61,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "") #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 #<date> server id 1 end_log_pos 899 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 899 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -89,7 +89,7 @@ BEGIN ...@@ -89,7 +89,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL) #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 #<date> server id 1 end_log_pos 1214 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1214 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=11 /* INT meta=0 nullable=0 is_null=0 */ ### @1=11 /* INT meta=0 nullable=0 is_null=0 */
...@@ -117,7 +117,7 @@ BEGIN ...@@ -117,7 +117,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A") #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 #<date> server id 1 end_log_pos 1530 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1530 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=12 /* INT meta=0 nullable=0 is_null=0 */ ### @1=12 /* INT meta=0 nullable=0 is_null=0 */
...@@ -145,7 +145,7 @@ BEGIN ...@@ -145,7 +145,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A") #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 #<date> server id 1 end_log_pos 1842 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1842 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=13 /* INT meta=0 nullable=0 is_null=0 */ ### @1=13 /* INT meta=0 nullable=0 is_null=0 */
...@@ -173,7 +173,7 @@ BEGIN ...@@ -173,7 +173,7 @@ BEGIN
#Q> INSERT INTO t2 SELECT * FROM t1 #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 #<date> server id 1 end_log_pos 2134 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2134 # 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` ### INSERT INTO `test`.`t2`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -234,7 +234,7 @@ BEGIN ...@@ -234,7 +234,7 @@ BEGIN
#Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL #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 #<date> server id 1 end_log_pos 2462 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2462 # 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` ### UPDATE `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -314,7 +314,7 @@ BEGIN ...@@ -314,7 +314,7 @@ BEGIN
#Q> DELETE FROM t1 #Q> DELETE FROM t1
#<date> server id 1 end_log_pos 2769 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos 2769 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 2769 # 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` ### DELETE FROM `test`.`t1`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -375,7 +375,7 @@ BEGIN ...@@ -375,7 +375,7 @@ BEGIN
#Q> DELETE FROM t2 #Q> DELETE FROM t2
#<date> server id 1 end_log_pos 3069 CRC32 XXX Table_map: `test`.`t2` mapped to number num #<date> server id 1 end_log_pos 3069 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 3069 # 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` ### DELETE FROM `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
......
...@@ -59,7 +59,7 @@ BEGIN ...@@ -59,7 +59,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "") #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 #<date> server id 1 end_log_pos 946 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 946 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -87,7 +87,7 @@ BEGIN ...@@ -87,7 +87,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL) #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 #<date> server id 1 end_log_pos 1262 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1262 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=11 /* INT meta=0 nullable=0 is_null=0 */ ### @1=11 /* INT meta=0 nullable=0 is_null=0 */
...@@ -115,7 +115,7 @@ BEGIN ...@@ -115,7 +115,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A") #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 #<date> server id 1 end_log_pos 1579 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1579 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=12 /* INT meta=0 nullable=0 is_null=0 */ ### @1=12 /* INT meta=0 nullable=0 is_null=0 */
...@@ -143,7 +143,7 @@ BEGIN ...@@ -143,7 +143,7 @@ BEGIN
#Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A") #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 #<date> server id 1 end_log_pos 1892 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1892 # 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` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=13 /* INT meta=0 nullable=0 is_null=0 */ ### @1=13 /* INT meta=0 nullable=0 is_null=0 */
...@@ -171,7 +171,7 @@ BEGIN ...@@ -171,7 +171,7 @@ BEGIN
#Q> INSERT INTO t2 SELECT * FROM t1 #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 #<date> server id 1 end_log_pos 2187 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2187 # 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` ### INSERT INTO `test`.`t2`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -232,7 +232,7 @@ BEGIN ...@@ -232,7 +232,7 @@ BEGIN
#Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL #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 #<date> server id 1 end_log_pos 2591 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2591 # 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` ### UPDATE `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -267,7 +267,7 @@ BEGIN ...@@ -267,7 +267,7 @@ BEGIN
#Q> DELETE FROM t1 #Q> DELETE FROM t1
#<date> server id 1 end_log_pos 2873 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos 2873 CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 2873 # 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` ### DELETE FROM `test`.`t1`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
...@@ -296,7 +296,7 @@ BEGIN ...@@ -296,7 +296,7 @@ BEGIN
#Q> DELETE FROM t2 #Q> DELETE FROM t2
#<date> server id 1 end_log_pos 3135 CRC32 XXX Table_map: `test`.`t2` mapped to number num #<date> server id 1 end_log_pos 3135 CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 3135 # 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` ### DELETE FROM `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
......
...@@ -32,6 +32,7 @@ mysql.time_zone_name OK ...@@ -32,6 +32,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
mtr.global_suppressions Table is already up to date mtr.global_suppressions Table is already up to date
mtr.test_suppressions Table is already up to date mtr.test_suppressions Table is already up to date
mysql.column_stats OK mysql.column_stats OK
...@@ -66,6 +67,9 @@ mysql.time_zone_name OK ...@@ -66,6 +67,9 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template
note : Table does not support optimize, doing recreate + analyze instead
status : OK
mysql.column_stats OK mysql.column_stats OK
mysql.columns_priv OK mysql.columns_priv OK
mysql.db OK mysql.db OK
...@@ -94,6 +98,7 @@ mysql.time_zone_name OK ...@@ -94,6 +98,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
mysql.vtmd_template OK
mysql.column_stats Table is already up to date mysql.column_stats Table is already up to date
mysql.columns_priv Table is already up to date mysql.columns_priv Table is already up to date
mysql.db 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 ...@@ -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 Table is already up to date
mysql.time_zone_transition_type 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.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 table t1 (a int) engine=myisam;
create view v1 as select * from t1; create view v1 as select * from t1;
test.t1 OK test.t1 OK
...@@ -448,6 +456,7 @@ mysql.time_zone_name Table is already up to date ...@@ -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 Table is already up to date
mysql.time_zone_transition_type 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.user Table is already up to date
mysql.vtmd_template OK
mysqltest1.t1 mysqltest1.t1
warning : Table is marked as crashed warning : Table is marked as crashed
warning : Size of datafile is: 4 Should be: 0 warning : Size of datafile is: 4 Should be: 0
......
...@@ -1211,18 +1211,21 @@ COUNT(*) ...@@ -1211,18 +1211,21 @@ COUNT(*)
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
execute my_stmt; execute my_stmt;
COUNT(*) COUNT(*)
46 46
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
execute my_stmt; execute my_stmt;
COUNT(*) COUNT(*)
46 46
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
deallocate prepare my_stmt; deallocate prepare my_stmt;
drop procedure if exists p1| drop procedure if exists p1|
drop table if exists t1| drop table if exists t1|
......
...@@ -30,6 +30,7 @@ time_zone_name ...@@ -30,6 +30,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
show create table db; show create table db;
Table Create Table Table Create Table
db CREATE TABLE `db` ( db CREATE TABLE `db` (
......
...@@ -30,6 +30,7 @@ time_zone_name ...@@ -30,6 +30,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
show create table db; show create table db;
Table Create Table Table Create Table
db CREATE TABLE `db` ( db CREATE TABLE `db` (
......
...@@ -30,6 +30,7 @@ time_zone_name ...@@ -30,6 +30,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
show create table db; show create table db;
Table Create Table Table Create Table
db CREATE TABLE `db` ( db CREATE TABLE `db` (
......
...@@ -30,6 +30,7 @@ time_zone_name ...@@ -30,6 +30,7 @@ time_zone_name
time_zone_transition time_zone_transition
time_zone_transition_type time_zone_transition_type
user user
vtmd_template
show create table db; show create table db;
Table Create Table Table Create Table
db CREATE TABLE `db` ( db CREATE TABLE `db` (
......
...@@ -13,6 +13,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -13,6 +13,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
test/t1 test/t1
test/t2 test/t2
innodb_system innodb_system
...@@ -32,12 +33,13 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -32,12 +33,13 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
test/t2 mysql/vtmd_template
test/t3 test/t3
innodb_system innodb_system
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME NAME
test/t1 test/t1
test/t2
# t1 yes on expecting NOT FOUND # t1 yes on expecting NOT FOUND
NOT FOUND /foobar/ in t1.ibd NOT FOUND /foobar/ in t1.ibd
# t2 ... on expecting FOUND # t2 ... on expecting FOUND
...@@ -57,6 +59,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -57,6 +59,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
test/t1 test/t1
test/t2 test/t2
innodb_system innodb_system
......
...@@ -4,6 +4,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -4,6 +4,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
create database enctests; create database enctests;
use enctests; use enctests;
......
...@@ -34,6 +34,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -34,6 +34,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
test/t1 test/t1
test/t2 test/t2
innodb_system innodb_system
......
...@@ -8,13 +8,13 @@ if (`select count(*) = 0 from information_schema.plugins ...@@ -8,13 +8,13 @@ if (`select count(*) = 0 from information_schema.plugins
set global innodb_encrypt_tables=ON; set global innodb_encrypt_tables=ON;
show variables like 'innodb_encrypt%'; 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 --source include/wait_condition.inc
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1; select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 1;
set global debug_key_management_version=10; 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 --source include/wait_condition.inc
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10; select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
......
...@@ -26,7 +26,7 @@ insert t3 values (repeat('dummy', 42)); ...@@ -26,7 +26,7 @@ insert t3 values (repeat('dummy', 42));
--echo # Wait max 10 min for key encryption threads to encrypt all spaces --echo # Wait max 10 min for key encryption threads to encrypt all spaces
--let $wait_timeout= 600 --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 --source include/wait_condition.inc
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0;
......
...@@ -106,6 +106,7 @@ table_catalog table_schema table_name column_name ...@@ -106,6 +106,7 @@ table_catalog table_schema table_name column_name
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
############################################################################### ###############################################################################
# Testcase 3.2.6.2 + 3.2.6.3: INFORMATION_SCHEMA.COLUMNS accessible information # Testcase 3.2.6.2 + 3.2.6.3: INFORMATION_SCHEMA.COLUMNS accessible information
############################################################################### ###############################################################################
......
...@@ -265,6 +265,11 @@ def mysql user Update_priv 6 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci e ...@@ -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 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_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 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 # 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) ...@@ -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 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) 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 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
...@@ -143,6 +143,7 @@ def mysql PRIMARY def mysql time_zone_transition_type Time_zone_id ...@@ -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 time_zone_transition_type Transition_type_id
def mysql PRIMARY def mysql user Host def mysql PRIMARY def mysql user Host
def mysql PRIMARY def mysql user User 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 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information
######################################################################################## ########################################################################################
......
...@@ -154,6 +154,7 @@ def mysql user mysql PRIMARY ...@@ -154,6 +154,7 @@ def mysql user mysql PRIMARY
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB'
#################################################################################### ####################################################################################
# Testcase 3.2.14.2 + 3.2.14.3: INFORMATION_SCHEMA.STATISTICS accessible information # Testcase 3.2.14.2 + 3.2.14.3: INFORMATION_SCHEMA.STATISTICS accessible information
#################################################################################### ####################################################################################
......
...@@ -79,6 +79,7 @@ def mysql time_zone_transition_type 0 mysql PRIMARY 1 Time_zone_id A #CARD# NULL ...@@ -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 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 1 Host A #CARD# NULL NULL BTREE
def mysql user 0 mysql PRIMARY 2 User 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; connect testuser1,localhost,testuser1,,db_datadict;
SELECT * FROM information_schema.statistics SELECT * FROM information_schema.statistics
WHERE table_schema = 'mysql' WHERE table_schema = 'mysql'
......
...@@ -88,6 +88,7 @@ def mysql PRIMARY mysql time_zone_name ...@@ -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
def mysql PRIMARY mysql time_zone_transition_type def mysql PRIMARY mysql time_zone_transition_type
def mysql PRIMARY mysql user 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 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.TABLE_CONSTRAINTS accessible information
######################################################################################### #########################################################################################
......
...@@ -38,6 +38,7 @@ def mysql PRIMARY mysql time_zone_name PRIMARY KEY ...@@ -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 PRIMARY KEY
def mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY def mysql PRIMARY mysql time_zone_transition_type PRIMARY KEY
def mysql PRIMARY mysql user PRIMARY KEY def mysql PRIMARY mysql user PRIMARY KEY
def mysql PRIMARY mysql vtmd_template PRIMARY KEY
connect testuser1,localhost,testuser1,,db_datadict; connect testuser1,localhost,testuser1,,db_datadict;
SELECT * FROM information_schema.table_constraints SELECT * FROM information_schema.table_constraints
WHERE table_schema = 'mysql' WHERE table_schema = 'mysql'
......
...@@ -700,6 +700,29 @@ CREATE_OPTIONS #CO# ...@@ -700,6 +700,29 @@ CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
user_comment Users and global privileges user_comment Users and global privileges
Separator ----------------------------------------------------- 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; DROP USER testuser1@localhost;
CREATE USER testuser1@localhost; CREATE USER testuser1@localhost;
GRANT SELECT ON test1.* TO testuser1@localhost; GRANT SELECT ON test1.* TO testuser1@localhost;
......
...@@ -161,6 +161,19 @@ drop procedure concat_exec2; ...@@ -161,6 +161,19 @@ drop procedure concat_exec2;
drop procedure concat_exec3; drop procedure concat_exec3;
drop function get_historical_table_name; drop function get_historical_table_name;
drop procedure drop_last_historical; 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; call verify_vtq;
No A B C D No A B C D
1 1 1 1 1 1 1 1 1 1
......
...@@ -98,6 +98,9 @@ drop procedure concat_exec3; ...@@ -98,6 +98,9 @@ drop procedure concat_exec3;
drop function get_historical_table_name; drop function get_historical_table_name;
drop procedure drop_last_historical; drop procedure drop_last_historical;
select * from mysql.vtmd_template;
show create table mysql.vtmd_template;
call verify_vtq; call verify_vtq;
drop table t; drop table t;
......
...@@ -72,7 +72,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, ...@@ -72,7 +72,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL,
-- disable_query_log -- disable_query_log
# Drop all tables created by this test # 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 -- enable_query_log
......
...@@ -79,7 +79,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r ...@@ -79,7 +79,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r
-- disable_query_log -- disable_query_log
# Drop all tables created by this test # 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 -- enable_query_log
......
...@@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_b ...@@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_b
-- disable_query_log -- disable_query_log
# Drop all tables created by this test # 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 -- enable_query_log
......
...@@ -129,6 +129,16 @@ SET @create_innodb_index_stats="CREATE TABLE IF NOT EXISTS innodb_index_stats ( ...@@ -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) PRIMARY KEY (database_name, table_name, index_name, stat_name)
) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0"; ) 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"); SET @str=IF(@have_innodb <> 0, @create_innodb_table_stats, "SET @dummy = 0");
PREPARE stmt FROM @str; PREPARE stmt FROM @str;
EXECUTE stmt; EXECUTE stmt;
...@@ -139,6 +149,11 @@ PREPARE stmt FROM @str; ...@@ -139,6 +149,11 @@ PREPARE stmt FROM @str;
EXECUTE stmt; EXECUTE stmt;
DROP PREPARE 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 ( 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.', 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.', Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the current relay log file.',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment