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

Automatic merge Mariadb 5.1->5.2.

Browse Source
This commit is contained in:
unknown
2011-05-09 15:09:40 +02:00
parent 8882d71f3f e2ff288531
commit e1ceb8048c
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,7 @@ STOP SLAVE;
ROLLBACK; ROLLBACK;
[connection master] [connection master]
SET DEBUG_SYNC= 'now SIGNAL signal.continue'; SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
[connection slave] [connection slave]
include/wait_for_slave_to_stop.inc include/wait_for_slave_to_stop.inc

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

@ -109,6 +109,7 @@ ROLLBACK;
--source include/rpl_connection_master.inc --source include/rpl_connection_master.inc
SET DEBUG_SYNC= 'now SIGNAL signal.continue'; SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
--source include/rpl_connection_slave.inc --source include/rpl_connection_slave.inc

5
sql/sql_repl.cc
View File

@ -571,6 +571,11 @@ impossible position";
DBUG_ASSERT(opt_debug_sync_timeout > 0); DBUG_ASSERT(opt_debug_sync_timeout > 0);
DBUG_ASSERT(!debug_sync_set_action(current_thd, DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
const char act2[]=
"now "
"signal signal.continued";
DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act2)));
} }
}); });