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

merge from 5.5-mtr

Browse Source
This commit is contained in:
Bjorn Munch
2010-10-26 08:30:02 +02:00
parent 29f3d85df1 56354413f8
commit 32c86a488d
24 changed files with 191 additions and 53 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;