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

merge from 5.1-mtr

Browse Source
This commit is contained in:
Bjorn Munch
2010-10-25 15:48:41 +02:00
parent 06c49d571b 909f0bf94a
commit 676e012e47
19 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ echo [on master];
# This will block the execution of a statement at the DBUG_SYNC_POINT
# with given lock name
if (`SELECT '$debug_lock' != ''`)
if ($debug_lock)
{
disable_query_log;
disable_result_log;