diff options
Diffstat (limited to 'mysql-test/suite')
50 files changed, 161 insertions, 22 deletions
diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/disabled.def index 1abc9951322..1abc9951322 100644 --- a/mysql-test/suite/binlog/t/disabled.def +++ b/mysql-test/suite/binlog/disabled.def diff --git a/mysql-test/suite/engines/funcs/t/disabled.def b/mysql-test/suite/engines/funcs/disabled.def index 2d8ea2d4ff8..2d8ea2d4ff8 100644 --- a/mysql-test/suite/engines/funcs/t/disabled.def +++ b/mysql-test/suite/engines/funcs/disabled.def diff --git a/mysql-test/suite/engines/iuds/t/disabled.def b/mysql-test/suite/engines/iuds/disabled.def index 7fd504c0996..7fd504c0996 100644 --- a/mysql-test/suite/engines/iuds/t/disabled.def +++ b/mysql-test/suite/engines/iuds/disabled.def diff --git a/mysql-test/suite/federated/combinations b/mysql-test/suite/federated/combinations index 18fd5f0d721..668c1c05c50 100644 --- a/mysql-test/suite/federated/combinations +++ b/mysql-test/suite/federated/combinations @@ -1,8 +1,6 @@ [old] ---federated ---plugin-load=$HA_FEDERATED_SO +plugin-load=$HA_FEDERATED_SO [X] ---federated ---plugin-load=$HA_FEDERATEDX_SO +plugin-load=$HA_FEDERATEDX_SO diff --git a/mysql-test/suite/federated/have_federatedx.opt b/mysql-test/suite/federated/have_federatedx.opt index 22f40b6d3d7..21f6f149f09 100644 --- a/mysql-test/suite/federated/have_federatedx.opt +++ b/mysql-test/suite/federated/have_federatedx.opt @@ -1 +1 @@ ---plugin-load=$HA_FEDERATEDX_SO +--plugin-load=$HA_FEDERATEDX_SO --federated diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf index ec27e189179..b97f8266ff1 100644 --- a/mysql-test/suite/federated/my.cnf +++ b/mysql-test/suite/federated/my.cnf @@ -3,6 +3,7 @@ !include include/default_client.cnf [mysqld.1] +federated #log-bin= master-bin [mysqld.2] diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/disabled.def index 9bfe9567d83..9bfe9567d83 100644 --- a/mysql-test/suite/funcs_1/t/disabled.def +++ b/mysql-test/suite/funcs_1/disabled.def diff --git a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test index 27d23be00e0..330dfa20629 100644 --- a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test +++ b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test @@ -13,7 +13,6 @@ # 2008-06-06 mleich Create this variant for the embedded server # ---source include/have_innodb.inc --source include/have_xtradb.inc if (`SELECT VERSION() NOT LIKE '%embedded%'`) diff --git a/mysql-test/suite/funcs_2/t/disabled.def b/mysql-test/suite/funcs_2/disabled.def index 8b137891791..8b137891791 100644 --- a/mysql-test/suite/funcs_2/t/disabled.def +++ b/mysql-test/suite/funcs_2/disabled.def diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/disabled.def index 888298bbb09..888298bbb09 100644 --- a/mysql-test/suite/innodb/t/disabled.def +++ b/mysql-test/suite/innodb/disabled.def diff --git a/mysql-test/suite/innodb/include/restart_and_reinit.inc b/mysql-test/suite/innodb/include/restart_and_reinit.inc index f95373c4037..0f8c1f913d0 100644 --- a/mysql-test/suite/innodb/include/restart_and_reinit.inc +++ b/mysql-test/suite/innodb/include/restart_and_reinit.inc @@ -3,12 +3,13 @@ # # this file deletes old innodb files and restarts mysqld # +source include/not_embedded.inc; let $_server_id= `SELECT @@server_id`; let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect; let $datadir= `SELECT @@datadir`; exec echo "wait" > $_expect_file_name; -shutdown_server 10; # give it 10 seconds to die +shutdown_server; remove_file $datadir/ib_logfile0; remove_file $datadir/ib_logfile1; remove_file $datadir/ibdata1; diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test index a7e1e607cd8..505c21547b2 100644 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb/t/innodb_bug47167.test @@ -4,7 +4,7 @@ # originally "innodb_file_format_check") with a user-Defined Variable. --source include/not_embedded.inc ---source suite/innodb/include/restart_and_reinit.inc +--source include/restart_and_reinit.inc # Save the value (Antelope) in 'innodb_file_format_max' to # 'old_innodb_file_format_max' diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test index e6c442f80dc..941edb728dd 100644 --- a/mysql-test/suite/innodb/t/innodb_file_format.test +++ b/mysql-test/suite/innodb/t/innodb_file_format.test @@ -1,5 +1,5 @@ --source include/have_innodb.inc ---source suite/innodb/include/restart_and_reinit.inc +--source include/restart_and_reinit.inc let $innodb_file_format_orig=`select @@innodb_file_format`; diff --git a/mysql-test/suite/jp/t/disabled.def b/mysql-test/suite/jp/disabled.def index 888298bbb09..888298bbb09 100644 --- a/mysql-test/suite/jp/t/disabled.def +++ b/mysql-test/suite/jp/disabled.def diff --git a/mysql-test/suite/mtr/t/combs.combinations b/mysql-test/suite/mtr/t/combs.combinations new file mode 100644 index 00000000000..9e49febf18f --- /dev/null +++ b/mysql-test/suite/mtr/t/combs.combinations @@ -0,0 +1,5 @@ +[c1] +allow-suspicious-udfs + +[c2] +disable-local-infile diff --git a/mysql-test/suite/mtr/t/combs.inc b/mysql-test/suite/mtr/t/combs.inc new file mode 100644 index 00000000000..fb677ac9128 --- /dev/null +++ b/mysql-test/suite/mtr/t/combs.inc @@ -0,0 +1 @@ +select @@local_infile; diff --git a/mysql-test/suite/mtr/t/inc.inc b/mysql-test/suite/mtr/t/inc.inc new file mode 100644 index 00000000000..bf391f6e16f --- /dev/null +++ b/mysql-test/suite/mtr/t/inc.inc @@ -0,0 +1 @@ +let $a=1; diff --git a/mysql-test/suite/mtr/t/newcomb.result b/mysql-test/suite/mtr/t/newcomb.result new file mode 100644 index 00000000000..8f7c125196a --- /dev/null +++ b/mysql-test/suite/mtr/t/newcomb.result @@ -0,0 +1,3 @@ +select 1; +1 +1 diff --git a/mysql-test/suite/mtr/t/newcomb.test b/mysql-test/suite/mtr/t/newcomb.test new file mode 100644 index 00000000000..fa0fa48e56a --- /dev/null +++ b/mysql-test/suite/mtr/t/newcomb.test @@ -0,0 +1,5 @@ +# +# this tests how mtr handles a test that has no combinations in the +# parent suite and one combination in the overlay. +# +select 1; diff --git a/mysql-test/suite/mtr/t/proxy.inc b/mysql-test/suite/mtr/t/proxy.inc new file mode 100644 index 00000000000..245f6a5a7fc --- /dev/null +++ b/mysql-test/suite/mtr/t/proxy.inc @@ -0,0 +1,2 @@ +select "proxy"; +source combs.inc; diff --git a/mysql-test/suite/mtr/t/self.result b/mysql-test/suite/mtr/t/self.result new file mode 100644 index 00000000000..bd0d7c6ec53 --- /dev/null +++ b/mysql-test/suite/mtr/t/self.result @@ -0,0 +1,3 @@ +select "<>"; +<> +<> diff --git a/mysql-test/suite/mtr/t/self.test b/mysql-test/suite/mtr/t/self.test new file mode 100644 index 00000000000..ad6e155cd94 --- /dev/null +++ b/mysql-test/suite/mtr/t/self.test @@ -0,0 +1,4 @@ +# +# Test file that includes itself. See self.test in the example overlay +# +eval select "<$a>"; diff --git a/mysql-test/suite/mtr/t/simple,c2,s1.rdiff b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff new file mode 100644 index 00000000000..3023756aa8a --- /dev/null +++ b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff @@ -0,0 +1,11 @@ +--- suite/mtr/t/simple.result 2012-02-04 12:13:41.000000000 +0100 ++++ suite/mtr/t/simple,infile,verbose.reject 2012-02-04 12:16:10.000000000 +0100 +@@ -3,7 +3,7 @@ + proxy + select @@local_infile; + @@local_infile +-1 ++0 + select @@old; + @@old + 0 diff --git a/mysql-test/suite/mtr/t/simple,s2,c2.rdiff b/mysql-test/suite/mtr/t/simple,s2,c2.rdiff new file mode 100644 index 00000000000..a9b9b56ef1c --- /dev/null +++ b/mysql-test/suite/mtr/t/simple,s2,c2.rdiff @@ -0,0 +1,11 @@ +--- suite/mtr/t/simple,old.result 2012-02-04 12:13:25.000000000 +0100 ++++ suite/mtr/t/simple,old,infile.reject 2012-02-04 12:13:59.000000000 +0100 +@@ -3,7 +3,7 @@ + proxy + select @@local_infile; + @@local_infile +-1 ++0 + select @@old; + @@old + 1 diff --git a/mysql-test/suite/mtr/t/simple,s2.result b/mysql-test/suite/mtr/t/simple,s2.result new file mode 100644 index 00000000000..0cd7a21e5f5 --- /dev/null +++ b/mysql-test/suite/mtr/t/simple,s2.result @@ -0,0 +1,9 @@ +select "proxy"; +proxy +proxy +select @@local_infile; +@@local_infile +1 +select @@old; +@@old +1 diff --git a/mysql-test/suite/mtr/t/simple.combinations b/mysql-test/suite/mtr/t/simple.combinations new file mode 100644 index 00000000000..88cbb688451 --- /dev/null +++ b/mysql-test/suite/mtr/t/simple.combinations @@ -0,0 +1,5 @@ +[s1] +verbose + +[s2] +old diff --git a/mysql-test/suite/mtr/t/simple.result b/mysql-test/suite/mtr/t/simple.result new file mode 100644 index 00000000000..b4a0c1238fa --- /dev/null +++ b/mysql-test/suite/mtr/t/simple.result @@ -0,0 +1,9 @@ +select "proxy"; +proxy +proxy +select @@local_infile; +@@local_infile +1 +select @@old; +@@old +0 diff --git a/mysql-test/suite/mtr/t/simple.test b/mysql-test/suite/mtr/t/simple.test new file mode 100644 index 00000000000..f69a7dc7911 --- /dev/null +++ b/mysql-test/suite/mtr/t/simple.test @@ -0,0 +1,15 @@ +# +# This tests the following: +# simple.test has two combinations (in simple.combinations). +# it includes combs.inc (indirectly, via proxy.inc) with two more combinations +# thus it should run 4 times +# +# combs.combinations is overlayed in the example overlay, adding one more +# combination. Thus simple.test must run two more times in the mtr-example. +# +# Note that neither simple.test nor proxy.inc are touched by the overlay, +# mtr needs to propagate "affected by the overlay" flag up the +# inclusion chain. +# +source proxy.inc; +select @@old; diff --git a/mysql-test/suite/mtr/t/single.result b/mysql-test/suite/mtr/t/single.result new file mode 100644 index 00000000000..8f7c125196a --- /dev/null +++ b/mysql-test/suite/mtr/t/single.result @@ -0,0 +1,3 @@ +select 1; +1 +1 diff --git a/mysql-test/suite/mtr/t/single.test b/mysql-test/suite/mtr/t/single.test new file mode 100644 index 00000000000..15262646ede --- /dev/null +++ b/mysql-test/suite/mtr/t/single.test @@ -0,0 +1,5 @@ +# +# the test is present in the mtr suite and is not affected by the example +# overlay. It should run only once. +# +select 1; diff --git a/mysql-test/suite/mtr/t/source.result b/mysql-test/suite/mtr/t/source.result new file mode 100644 index 00000000000..8f7c125196a --- /dev/null +++ b/mysql-test/suite/mtr/t/source.result @@ -0,0 +1,3 @@ +select 1; +1 +1 diff --git a/mysql-test/suite/mtr/t/source.test b/mysql-test/suite/mtr/t/source.test new file mode 100644 index 00000000000..1a2fc61e048 --- /dev/null +++ b/mysql-test/suite/mtr/t/source.test @@ -0,0 +1,8 @@ +# +# The inc.inc file is overlayed in the example overlay. mtr should correctly +# detect that this test needs to run for mtr-example. And mysqltest +# needs to use the correct version of inc.inc depending on whether it +# runs the parent suite or the overlay. +# +source inc.inc; +eval select $a; diff --git a/mysql-test/suite/mtr/t/test2.result b/mysql-test/suite/mtr/t/test2.result new file mode 100644 index 00000000000..b1a55b32da2 --- /dev/null +++ b/mysql-test/suite/mtr/t/test2.result @@ -0,0 +1,4 @@ +select @@local_infile; +select @@max_error_count; +@@max_error_count +64 diff --git a/mysql-test/suite/mtr/t/test2.test b/mysql-test/suite/mtr/t/test2.test new file mode 100644 index 00000000000..5e310eaed2f --- /dev/null +++ b/mysql-test/suite/mtr/t/test2.test @@ -0,0 +1,10 @@ +# +# This test has two combinations in the mtr suite (from combs.combinations) +# and one combination from mtr-example (overlayed combs.combinations). +# But it also has test2.opt file in the overlay. Thus it will run +# two times in the parent suite, and three times in the overlay. +# +--disable_result_log +source combs.inc; +--enable_result_log +select @@max_error_count; diff --git a/mysql-test/suite/mtr/t/testsh.result b/mysql-test/suite/mtr/t/testsh.result new file mode 100644 index 00000000000..8f7c125196a --- /dev/null +++ b/mysql-test/suite/mtr/t/testsh.result @@ -0,0 +1,3 @@ +select 1; +1 +1 diff --git a/mysql-test/suite/mtr/t/testsh.test b/mysql-test/suite/mtr/t/testsh.test new file mode 100644 index 00000000000..0bb818d2697 --- /dev/null +++ b/mysql-test/suite/mtr/t/testsh.test @@ -0,0 +1,6 @@ +# +# There is testsh-master.sh in the example overlay. That makes the test +# "affected by the overlay" and it will run twice: for the parent suite and +# for the overlay. +# +select 1; diff --git a/mysql-test/suite/mtr2/single.result b/mysql-test/suite/mtr2/single.result new file mode 100644 index 00000000000..8f7c125196a --- /dev/null +++ b/mysql-test/suite/mtr2/single.result @@ -0,0 +1,3 @@ +select 1; +1 +1 diff --git a/mysql-test/suite/mtr2/single.test b/mysql-test/suite/mtr2/single.test new file mode 100644 index 00000000000..122e1bb00e4 --- /dev/null +++ b/mysql-test/suite/mtr2/single.test @@ -0,0 +1,8 @@ +# +# this suite is overlayed in heap and myisam. +# mtr2-heap has my.cnf, mtr2-myisam has suite.opt +# it means that all tests from the mtr2 suite will run +# three times - once for the parent suite, and once for each overlay. +# even if the test files are not overlayed. +# +select 1; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/disabled.def b/mysql-test/suite/optimizer_unfixed_bugs/disabled.def index 148d19a9288..148d19a9288 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/disabled.def +++ b/mysql-test/suite/optimizer_unfixed_bugs/disabled.def diff --git a/mysql-test/suite/parts/t/disabled.def b/mysql-test/suite/parts/disabled.def index 96592e78911..96592e78911 100644 --- a/mysql-test/suite/parts/t/disabled.def +++ b/mysql-test/suite/parts/disabled.def diff --git a/mysql-test/suite/percona/innodb_sys_index.test b/mysql-test/suite/percona/innodb_sys_index.test index 9b1ac4c87e8..212baeda663 100644 --- a/mysql-test/suite/percona/innodb_sys_index.test +++ b/mysql-test/suite/percona/innodb_sys_index.test @@ -1,5 +1,5 @@ --source include/big_test.inc ---source include/have_innodb.inc +--source include/have_xtradb.inc drop table if exists t1; # diff --git a/mysql-test/suite/perfschema/t/disabled.def b/mysql-test/suite/perfschema/disabled.def index 8cae44a3607..8cae44a3607 100644 --- a/mysql-test/suite/perfschema/t/disabled.def +++ b/mysql-test/suite/perfschema/disabled.def diff --git a/mysql-test/suite/plugins/suite.pm b/mysql-test/suite/plugins/suite.pm index f8f78086c15..9ada541e44b 100644 --- a/mysql-test/suite/plugins/suite.pm +++ b/mysql-test/suite/plugins/suite.pm @@ -2,7 +2,12 @@ package My::Suite::Plugins; @ISA = qw(My::Suite); -$ENV{PAM_SETUP_FOR_MTR}=1 if -e '/etc/pam.d/mariadb_mtr'; +sub skip_combinations { + my %skip; + $skip{'t/pam.test'} = 'No pam setup for mtr' + unless -e '/etc/pam.d/mariadb_mtr'; + %skip; +} bless { }; diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test index 2a097b9bfd5..587a2380f94 100644 --- a/mysql-test/suite/plugins/t/pam.test +++ b/mysql-test/suite/plugins/t/pam.test @@ -5,10 +5,6 @@ if (!$AUTH_PAM_SO) { skip No pam auth plugin; } -if (!$PAM_SETUP_FOR_MTR) { - skip No pam setup for mtr; -} - eval install plugin pam soname '$AUTH_PAM_SO'; create user test_pam identified via pam using 'mariadb_mtr'; create user pam_test; diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/disabled.def index a45fdb47ae6..a45fdb47ae6 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/disabled.def diff --git a/mysql-test/suite/rpl/t/rpl_plugin_load.test b/mysql-test/suite/rpl/t/rpl_plugin_load.test index 5f9725a8e66..def10f50a64 100644 --- a/mysql-test/suite/rpl/t/rpl_plugin_load.test +++ b/mysql-test/suite/rpl/t/rpl_plugin_load.test @@ -10,8 +10,6 @@ --source include/not_embedded.inc --source include/have_log_bin.inc -# Dynamic loading of Example does not work on Windows currently. ---source include/not_windows.inc --source include/have_example_plugin.inc # Initialize replication. @@ -21,7 +19,8 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE'; --echo Get binlog position before install plugin. let $before_pos = query_get_value("SHOW MASTER STATUS", Position, 1); --echo Install example engine. -INSTALL PLUGIN example SONAME 'ha_example.so'; +--replace_regex /\.dll/.so/ +eval INSTALL PLUGIN example SONAME '$HA_EXAMPLE_SO'; --echo Get binlog position after install plugin. let $after_pos = query_get_value("SHOW MASTER STATUS", Position, 1); --echo Compute the difference of the binlog positions. diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test index f697fedfad4..42adeed06a7 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test @@ -19,6 +19,10 @@ call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received w enable_query_log; connection master; +# wait for dying connections (if any) to disappear +let $wait_condition= select count(*) = 0 from information_schema.processlist where command='killed'; +--source include/wait_condition.inc + # After fix of BUG#45848, semi-sync slave should not create any extra # connections on master, save the count of connections before start # semi-sync slave for comparison below. @@ -166,8 +170,7 @@ show status like 'Rpl_semi_sync_master_yes_tx'; # After fix of BUG#45848, semi-sync slave should not create any extra # connections on master. let $_connections_semisync_slave= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1); -replace_result $_connections_semisync_slave CONNECTIONS_SEMISYNC_SLAVE; -replace_result $_connections_normal_slave CONNECTIONS_NORMAL_SLAVE; +replace_result $_connections_normal_slave CONNECTIONS_NORMAL_SLAVE $_connections_semisync_slave CONNECTIONS_SEMISYNC_SLAVE; eval select $_connections_semisync_slave - $_connections_normal_slave as 'Should be 0'; let $i=300; diff --git a/mysql-test/suite/sphinx/my.cnf b/mysql-test/suite/sphinx/my.cnf index ba5dd7578e8..b4a4dc8e050 100644 --- a/mysql-test/suite/sphinx/my.cnf +++ b/mysql-test/suite/sphinx/my.cnf @@ -2,7 +2,7 @@ [source src1] type = xmlpipe2 -xmlpipe_command = cat suite/sphinx/testdata.xml +xmlpipe_command = cat @ENV.MTR_SUITE_DIR/testdata.xml [index test1] source = src1 diff --git a/mysql-test/suite/sphinx/suite.opt b/mysql-test/suite/sphinx/suite.opt index b8964ecd9e9..6a0a190f67a 100644 --- a/mysql-test/suite/sphinx/suite.opt +++ b/mysql-test/suite/sphinx/suite.opt @@ -1 +1 @@ ---plugin-load=$HA_SPHINX_SO +--plugin-load=$HA_SPHINX_SO --sphinx diff --git a/mysql-test/suite/sys_vars/t/disabled.def b/mysql-test/suite/sys_vars/disabled.def index 888298bbb09..888298bbb09 100644 --- a/mysql-test/suite/sys_vars/t/disabled.def +++ b/mysql-test/suite/sys_vars/disabled.def |