summaryrefslogtreecommitdiff
path: root/sql/sql_truncate.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2021-09-07 16:32:35 +0300
commitb85b8348e761e38dcc2d49d171b7e28c32397374 (patch)
tree03d22c6ea95877ab0d833292cc791a5a2dd0eac9 /sql/sql_truncate.cc
parent391f6b4f1ebe4dccfaf0181257aa46edb6253015 (diff)
parent528abc749e8a65674dd10f59a2d99d7841709939 (diff)
downloadmariadb-git-b85b8348e761e38dcc2d49d171b7e28c32397374.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_truncate.cc')
-rw-r--r--sql/sql_truncate.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 897db0a2b21..96e55bf4588 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -428,10 +428,9 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref)
if (thd->locked_tables_mode && thd->locked_tables_list.reopen_tables(thd, false))
{
- thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0);
- error=1;
+ thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0);
+ error= 1;
}
-
/* No need to binlog a failed truncate-by-recreate. */
binlog_stmt= !error;
}