database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

Browse Source 
Text conflict in mysql-test/suite/perfschema/r/dml_setup_instruments.result
Text conflict in mysql-test/suite/perfschema/r/global_read_lock.result
Text conflict in mysql-test/suite/perfschema/r/server_init.result
Text conflict in mysql-test/suite/perfschema/t/global_read_lock.test
Text conflict in mysql-test/suite/perfschema/t/server_init.test
This commit is contained in:
Jon Olav Hauglid
2010-11-12 12:23:17 +01:00
parent 6bf6272fda 5a8b8b6493
commit f11b9a88eb
244 changed files with 2466 additions and 22232 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
drop table t1;
delete from mysql.user where user="replicate";
call mtr.force_restart();

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

@ -142,3 +142,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/r/rpl_slave_status.result
View File

@ -33,3 +33,4 @@ Slave_IO_Running = No (should be No)
DROP TABLE t1;
[on master]
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";
sync_slave_with_master;
call mtr.force_restart();
# 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_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

1
mysql-test/suite/rpl/t/rpl_heartbeat-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_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_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_semi_sync-master.opt
View File

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

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

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

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

@ -68,3 +68,4 @@ DROP TABLE t1;
--echo [on master]
connection master;
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=======;
connection master;
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
--force-restart