diff options
| author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-09 09:18:12 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-09-09 09:23:35 +0300 |
| commit | de7e027d5e5a67d207927c4643b744ec2da25aac (patch) | |
| tree | 020cd80c7ce686593b73cef6912966ffc698e849 /sql/sql_truncate.cc | |
| parent | a4b3970c6ec5cbdc03dd7301e5a6fdd1faa81932 (diff) | |
| parent | a6383a1954bb9deb61425fce9d71e02d2dea56bd (diff) | |
| download | mariadb-git-de7e027d5e5a67d207927c4643b744ec2da25aac.tar.gz | |
Merge remote-tracking branch 'upstream/10.3' into 10.4
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 c495a417961..aca43021798 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -450,10 +450,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; } |