diff options
| author | unknown <Li-Bing.Song@sun.com> | 2010-10-16 22:20:35 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2010-10-16 22:20:35 +0800 |
| commit | c20cbe5b4af9fc4735fb5d4a6b15ddfcb20ae37d (patch) | |
| tree | 2a64770661183d8337ae0e746f0b197e5bcac1e7 /sql/sql_parse.cc | |
| parent | 650e4c25db94273bdf2300ddb987294f0d4edd72 (diff) | |
| parent | 211552ccee98e381a14dfaae754528d9f6ed0494 (diff) | |
| download | mariadb-git-c20cbe5b4af9fc4735fb5d4a6b15ddfcb20ae37d.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2f8a72ee25c..d308e1c7648 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2832,6 +2832,15 @@ end_with_restore_list: thd->first_successful_insert_id_in_cur_stmt= thd->first_successful_insert_id_in_prev_stmt; + DBUG_EXECUTE_IF("after_mysql_insert", + { + const char act[]= + "now " + "wait_for signal.continue"; + DBUG_ASSERT(opt_debug_sync_timeout > 0); + DBUG_ASSERT(!debug_sync_set_action(current_thd, + STRING_WITH_LEN(act))); + };); break; } case SQLCOM_REPLACE_SELECT: |