summaryrefslogtreecommitdiff
path: root/sql/transaction.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-03-30 20:12:02 +0300
committerMonty <monty@mariadb.org>2020-04-19 17:33:51 +0300
commitf9f33b85be6b5006f0ecd0de7961c71d415a9d73 (patch)
treeae547acc02c05876ccc9f54a3c7be614af206425 /sql/transaction.cc
parent7866b723048d1d0f4a202d5a1e5475420b1dda64 (diff)
downloadmariadb-git-f9f33b85be6b5006f0ecd0de7961c71d415a9d73.tar.gz
Handle errors from external_unlock & mysql_unlock_tables
Other things: - Handler errors from ha_maria::implict_commit - Disable DBUG in safe_mutex_lock to get trace file easier to read
Diffstat (limited to 'sql/transaction.cc')
-rw-r--r--sql/transaction.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc
index db40bd6177b..c9fd211c1f8 100644
--- a/sql/transaction.cc
+++ b/sql/transaction.cc
@@ -103,7 +103,8 @@ bool trans_begin(THD *thd, uint flags)
if (trans_check(thd))
DBUG_RETURN(TRUE);
- thd->locked_tables_list.unlock_locked_tables(thd);
+ if (thd->locked_tables_list.unlock_locked_tables(thd))
+ DBUG_RETURN(true);
DBUG_ASSERT(!thd->locked_tables_mode);