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

upmerge 57840

Browse Source
This commit is contained in:
Bjorn Munch
2010-11-05 15:36:00 +01:00
parent cf1b01e28f 866cec611a
commit c4c198092c
14 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,3 +141,4 @@ HEX(word)
SELECT * FROM tmptbl504451f4258$1;
ERROR 42S02: Table 'test.tmptbl504451f4258$1' doesn't exist
DROP TABLE t5;
call mtr.force_restart();

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

@ -1 +1,2 @@
--replicate-same-server-id --relay-log=slave-relay-bin
--force-restart

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

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

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

@ -174,3 +174,5 @@ SELECT * FROM tmptbl504451f4258$1;
connection master;
DROP TABLE t5;
sync_slave_with_master;
call mtr.force_restart();

1
mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
View File

@ -1 +1,2 @@
rm -f $MYSQLTEST_VARDIR/std_data_master_link
ln -s $MYSQLTEST_VARDIR/std_data $MYSQLTEST_VARDIR/std_data_master_link

1
mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
View File

@ -1 +1,2 @@
rm -f $MYSQLTEST_VARDIR/std_data_slave_link
ln -s $MYSQLTEST_VARDIR/std_data $MYSQLTEST_VARDIR/std_data_slave_link

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

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