Skip to content

Commit

Permalink
Tests: TRT-related results [#305]
Browse files Browse the repository at this point in the history
  • Loading branch information
@midenok
midenok committed Nov 21, 2017
1 parent 4f38657 commit 64d9b82
Show file tree
Hide file tree
Showing 37 changed files with 146 additions and 28 deletions.
1 change: 1 addition & 0 deletions mysql-test/r/1st.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ time_zone_leap_second
time_zone_name
time_zone_transition
time_zone_transition_type
transaction_registry
user
vtmd_template
3 changes: 3 additions & 0 deletions mysql-test/r/connect.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/r/ctype_upgrade.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/r/derived_view.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
#
Expand Down
4 changes: 4 additions & 0 deletions mysql-test/r/information_schema.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ time_zone_leap_second
time_zone_name
time_zone_transition
time_zone_transition_type
transaction_registry
user
v1
vtmd_template
Expand All @@ -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%";
Expand All @@ -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%";
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/r/information_schema_all_engines.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,4 @@ Wildcard: inf_rmation_schema
SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') GROUP BY TABLE_SCHEMA;
table_schema count(*)
information_schema 64
mysql 31
mysql 32
1 change: 1 addition & 0 deletions mysql-test/r/join.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions mysql-test/r/log_tables_upgrade.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions mysql-test/r/mysql_upgrade-6984.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
12 changes: 11 additions & 1 deletion mysql-test/r/mysql_upgrade.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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` (
Expand Down
6 changes: 6 additions & 0 deletions mysql-test/r/mysql_upgrade_no_innodb.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions mysql-test/r/mysql_upgrade_noengine.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,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
Expand Down Expand Up @@ -172,6 +173,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
Expand Down Expand Up @@ -261,6 +263,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
Upgrading from a version before MariaDB-10.1
Expand Down
1 change: 1 addition & 0 deletions mysql-test/r/mysql_upgrade_ssl.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,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
Expand Down
18 changes: 18 additions & 0 deletions mysql-test/r/mysql_upgrade_view.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,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'
Expand All @@ -109,6 +112,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
Expand Down Expand Up @@ -247,6 +253,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'
Expand All @@ -259,6 +268,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
Expand Down Expand Up @@ -372,6 +384,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'
Expand All @@ -384,6 +399,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
Expand Down

0 comments on commit 64d9b82

Please sign in to comment.