diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-01 16:24:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-01 16:24:59 +0100 |
| commit | e7e20585501ab331c37ef0ca5ced80d37079fb50 (patch) | |
| tree | 2b69405dfe90ce129e53ac5d023445452470ac1e /sql/handler.cc | |
| parent | c0a4377575c734ce8872d804229f852240d5b661 (diff) | |
| download | mariadb-git-e7e20585501ab331c37ef0ca5ced80d37079fb50.tar.gz | |
MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed at row0sel.c:3933
DELETE IGNORE should not ignore deadlocks
sql/mdl.cc:
more DBUG_ENTER/DBUG_RETURN
sql/sql_base.cc:
more DBUG_ENTER/DBUG_RETURN
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 50db743a8ff..516f61c8700 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2970,6 +2970,8 @@ void handler::print_error(int error, myf errflag) break; case HA_ERR_LOCK_DEADLOCK: textno=ER_LOCK_DEADLOCK; + /* cannot continue. the statement was already aborted in the engine */ + SET_FATAL_ERROR; break; case HA_ERR_READ_ONLY_TRANSACTION: textno=ER_READ_ONLY_TRANSACTION; |