diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
| commit | d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch) | |
| tree | c6e4678908c750d7f558e98cedc349aa1d350892 /sql/debug_sync.cc | |
| parent | af32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff) | |
| parent | 42221abaed700f6dc5d280b462755851780e8487 (diff) | |
| download | mariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index eb8e3b093c9..2f356122687 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -1123,7 +1123,7 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action) point decremented it to 0. In this case the following happened: - an error message was reported with my_error() and - - the statement was killed with thd->killed= THD::KILL_QUERY. + - the statement was killed with thd->killed= KILL_QUERY. If a statement reports an error, it must not call send_ok(). The calling functions will not call send_ok(), if we return TRUE @@ -1838,7 +1838,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) { if (!--action->hit_limit) { - thd->killed= THD::KILL_QUERY; + thd->killed= KILL_QUERY; my_error(ER_DEBUG_SYNC_HIT_LIMIT, MYF(0)); } DBUG_PRINT("debug_sync_exec", ("hit_limit: %lu at: '%s'", |