diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-05 16:03:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-05 16:03:58 +0200 |
| commit | 215043b7c2ace7ce05dcf6c685c87a293ccf1cd7 (patch) | |
| tree | 679d57ddbf9713b7129872db144ff408b0215b31 /sql/sql_parse.cc | |
| parent | 31a78529bc5c4431865eba06762e6cc66359f759 (diff) | |
| parent | 6b03fbf9fcacc74cb2999ba7715d22d754f356c7 (diff) | |
| download | mariadb-git-215043b7c2ace7ce05dcf6c685c87a293ccf1cd7.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 61c5ab8d245..0cbccf3bedd 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3233,12 +3233,17 @@ end_with_restore_list: DBUG_EXECUTE_IF("after_mysql_insert", { - const char act[]= + const char act1[]= "now " "wait_for signal.continue"; + const char act2[]= + "now " + "signal signal.continued"; DBUG_ASSERT(opt_debug_sync_timeout > 0); - DBUG_ASSERT(!debug_sync_set_action(current_thd, - STRING_WITH_LEN(act))); + DBUG_ASSERT(!debug_sync_set_action(thd, + STRING_WITH_LEN(act1))); + DBUG_ASSERT(!debug_sync_set_action(thd, + STRING_WITH_LEN(act2))); };); break; } |