diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 17:55:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 17:55:27 +0300 |
| commit | 15139964d52539a8bb96d090fa1b5b26921eab3e (patch) | |
| tree | 926d23e30e2c3aa09014a8005db95ad543694357 /sql/sql_truncate.cc | |
| parent | 54f79a0f7fc8b1b30073391319f1b2c37b4cc015 (diff) | |
| parent | 40b743f99e8ca5ac479e8c559f8316b606033582 (diff) | |
| download | mariadb-git-15139964d52539a8bb96d090fa1b5b26921eab3e.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 01e95d5f6b9..1613c5a6586 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -494,10 +494,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; } |