database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

some test fixes after merging 57840

Browse Source
This commit is contained in:
Bjorn Munch
2010-11-06 19:21:12 +01:00
parent c4c198092c
commit e0678e2ca6
12 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/r/rpl000017.result
View File

@@ -13,3 +13,4 @@ n
24 24
drop table t1; drop table t1;
delete from mysql.user where user="replicate"; delete from mysql.user where user="replicate";
call mtr.force_restart();

1
mysql-test/suite/rpl/r/rpl_slave_status.result
View File

@@ -33,3 +33,4 @@ Slave_IO_Running = No (should be No)
DROP TABLE t1; DROP TABLE t1;
[on master] [on master]
DROP TABLE t1; DROP TABLE t1;
call mtr.force_restart();

2
mysql-test/suite/rpl/t/rpl000017.test
View File

@@ -31,4 +31,6 @@ drop table t1;
delete from mysql.user where user="replicate"; delete from mysql.user where user="replicate";
sync_slave_with_master; sync_slave_with_master;
call mtr.force_restart();
# End of 4.1 tests # End of 4.1 tests

1
mysql-test/suite/rpl/t/rpl_bug33931-master.opt Normal file
View File

@@ -0,0 +1 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_heartbeat-master.opt Normal file
View File

@@ -0,0 +1 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_ip_mix-master.opt Normal file
View File

@@ -0,0 +1 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt Normal file
View File

@@ -0,0 +1 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
View File

@@ -1 +1,2 @@
$SEMISYNC_PLUGIN_OPT $SEMISYNC_PLUGIN_OPT
--force-restart

1
mysql-test/suite/rpl/t/rpl_slave_status.test
View File

@@ -68,3 +68,4 @@ DROP TABLE t1;
--echo [on master] --echo [on master]
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
call mtr.force_restart();

1
mysql-test/suite/rpl/t/rpl_sync.test
View File

@@ -150,3 +150,4 @@ source include/diff_tables.inc;
--echo =====Clean up=======; --echo =====Clean up=======;
connection master; connection master;
drop table t1; drop table t1;
--remove_file $MYSQLD_SLAVE_DATADIR/master.backup

3
mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
View File

@@ -1,3 +1,2 @@
--loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 --loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2
--force-restart

2
mysql-test/t/union.test
View File

@@ -1062,7 +1062,7 @@ SELECT ( SELECT a UNION SELECT a ) INTO OUTFILE 'union.out.file3' FROM t1;
SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1; SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1;
DROP TABLE t1; DROP TABLE t1;
remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.1/data/test union.out.fil*;
--echo # --echo #
--echo # Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY --echo # Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY