1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#59147: Automerged bzr bundle form bug report into mysql-5.1 .

Browse Source
This commit is contained in:
Luis Soares 2011-02-04 14:57:51 +00:00
commit 2dfb4c5ed3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/rpl_sync.inc
View File

@ -88,7 +88,7 @@ while ($_rpl_i) {
{ {
--echo Sync IO: $_rpl_slave_io_running; Sync SQL: $_rpl_slave_sql_running --echo Sync IO: $_rpl_slave_io_running; Sync SQL: $_rpl_slave_sql_running
} }
--let $_rpl_slave_io_running= `SELECT IF('$_rpl_slave_io_running' = 'Yes', 1, '')` --let $_rpl_slave_io_running= `SELECT IF('$_rpl_slave_io_running' != 'No', 1, '')`
--let $_rpl_slave_sql_running= `SELECT IF('$_rpl_slave_sql_running' = 'Yes', 1, '')` --let $_rpl_slave_sql_running= `SELECT IF('$_rpl_slave_sql_running' = 'Yes', 1, '')`
if ($_rpl_slave_io_running) if ($_rpl_slave_io_running)
{ {

4
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
View File

@ -121,11 +121,11 @@ Master D 12 D
* Remove wrong event from C and restore B->C->D * * Remove wrong event from C and restore B->C->D *
include/stop_slave.inc include/stop_slave.inc
DELETE FROM t1 WHERE a = 6; DELETE FROM t1 WHERE a = 6;
START SLAVE; include/start_slave.inc
RESET MASTER; RESET MASTER;
RESET SLAVE; RESET SLAVE;
include/rpl_change_topology.inc [new topology=1->2->3->4->1] include/rpl_change_topology.inc [new topology=1->2->3->4->1]
START SLAVE; include/start_slave.inc
include/rpl_sync.inc include/rpl_sync.inc
* Check data inserted before restoring schema A->B->C->D->A * * Check data inserted before restoring schema A->B->C->D->A *

4
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
View File

@ -175,7 +175,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 3 ORDER BY a,b;
source include/stop_slave.inc; source include/stop_slave.inc;
--connection server_3 --connection server_3
DELETE FROM t1 WHERE a = 6; DELETE FROM t1 WHERE a = 6;
START SLAVE; --source include/start_slave.inc
--connection server_2 --connection server_2
--sync_slave_with_master server_3 --sync_slave_with_master server_3
RESET MASTER; RESET MASTER;
@ -189,7 +189,7 @@ RESET SLAVE;
--source include/rpl_change_topology.inc --source include/rpl_change_topology.inc
#--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $file_d LOG_FILE $pos_d LOG_POS #--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 $file_d LOG_FILE $pos_d LOG_POS
#--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SERVER_MYPORT_3,master_user='root',master_log_file='$file_d',master_log_pos=$pos_d #--eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$SERVER_MYPORT_3,master_user='root',master_log_file='$file_d',master_log_pos=$pos_d
START SLAVE; --source include/start_slave.inc
--connection server_3 --connection server_3
--sync_slave_with_master server_4 --sync_slave_with_master server_4
--source include/rpl_sync.inc --source include/rpl_sync.inc