Tests: TRT-related results [#305]

Author: midenok

mysql-test/r/1st.result

@@ -36,5 +36,6 @@ time_zone_leap_second
 time_zone_name
 time_zone_transition
 time_zone_transition_type
+transaction_registry
 user
 vtmd_template

mysql-test/r/connect.result

@@ -32,6 +32,7 @@ time_zone_leap_second
 time_zone_name
 time_zone_transition
 time_zone_transition_type
+transaction_registry
 user
 vtmd_template
 connect con2,localhost,root,,test;
@@ -80,6 +81,7 @@ time_zone_leap_second
 time_zone_name
 time_zone_transition
 time_zone_transition_type
+transaction_registry
 user
 vtmd_template
 connect con4,localhost,test,gambling,test;
@@ -140,6 +142,7 @@ time_zone_leap_second
 time_zone_name
 time_zone_transition
 time_zone_transition_type
+transaction_registry
 user
 vtmd_template
 connect con6,localhost,test,gambling3,test;

mysql-test/r/ctype_upgrade.result

@@ -257,6 +257,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -316,6 +317,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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

mysql-test/r/derived_view.result

@@ -2312,6 +2312,8 @@ Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1286	Unknown storage engine 'InnoDB'
 DROP TABLE t1;
 SET SESSION optimizer_switch= @save_optimizer_switch;
 #

mysql-test/r/information_schema.result

@@ -121,6 +121,7 @@ time_zone_leap_second
 time_zone_name
 time_zone_transition
 time_zone_transition_type
+transaction_registry
 user
 v1
 vtmd_template
@@ -146,6 +147,7 @@ time_zone_leap_second	time_zone_leap_second
 time_zone_name	time_zone_name
 time_zone_transition	time_zone_transition
 time_zone_transition_type	time_zone_transition_type
+transaction_registry	transaction_registry
 select c,table_name from v1 
 left join information_schema.TABLES v2 on (v1.c=v2.table_name)
 where v1.c like "t%";
@@ -168,6 +170,7 @@ time_zone_leap_second	time_zone_leap_second
 time_zone_name	time_zone_name
 time_zone_transition	time_zone_transition
 time_zone_transition_type	time_zone_transition_type
+transaction_registry	transaction_registry
 select c, v2.table_name from v1
 right join information_schema.TABLES v2 on (v1.c=v2.table_name)
 where v1.c like "t%";
@@ -190,6 +193,7 @@ time_zone_leap_second	time_zone_leap_second
 time_zone_name	time_zone_name
 time_zone_transition	time_zone_transition
 time_zone_transition_type	time_zone_transition_type
+transaction_registry	transaction_registry
 select table_name from information_schema.TABLES
 where table_schema = "mysqltest" and table_name like "t%";
 table_name

mysql-test/r/information_schema_all_engines.result

@@ -454,4 +454,4 @@ Wildcard: inf_rmation_schema
 SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
 information_schema	64
-mysql31
+mysql32

mysql-test/r/join.result

@@ -763,6 +763,7 @@ Warnings:
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
 Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1286	Unknown storage engine 'InnoDB'
 drop table t1;
 drop table t2;
 drop table t3;

mysql-test/r/log_tables_upgrade.result

@@ -42,6 +42,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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

mysql-test/r/mysql_upgrade-6984.result

@@ -33,6 +33,9 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 mysql.time_zone_transition OK
 mysql.time_zone_transition_type OK
+mysql.transaction_registry
+Error : Unknown storage engine 'InnoDB'
+error : Corrupt
 mysql.user OK
 mysql.vtmd_template
 Error : Unknown storage engine 'InnoDB'
@@ -45,6 +48,9 @@ error : Corrupt
 mysql.innodb_table_stats
 Error : Unknown storage engine 'InnoDB'
 error : Corrupt
+mysql.transaction_registry
+Error : Unknown storage engine 'InnoDB'
+error : Corrupt
 mysql.vtmd_template
 Error : Unknown storage engine 'InnoDB'
 error : Corrupt

mysql-test/r/mysql_upgrade.result

@@ -30,6 +30,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -79,6 +80,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -128,6 +130,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -182,6 +185,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -237,6 +241,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -295,6 +300,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -348,6 +354,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -393,6 +400,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -459,6 +467,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -542,6 +551,7 @@ mysql.time_zone_leap_second OK
 mysql.time_zone_name OK
 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
@@ -562,7 +572,7 @@ OK
 # Should return 2
 SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
 count(*)
-3
+4
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (