diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2021-09-22 14:59:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 14:59:23 +0900 |
| commit | b194cc4933f4dde06761018bc6bf4bb16319d328 (patch) | |
| tree | 7b264db426390d239f108bfa35c8a422a70c7882 /sql/sql_truncate.cc | |
| parent | b044ec100116f096e30f603d55b2b8fca2d3e6c2 (diff) | |
| parent | f4d6d01782ad4c885f1a4041514ba58f7b7d4ad2 (diff) | |
| download | mariadb-git-bb-10.2-mdev-26545.tar.gz | |
Merge branch '10.2' into 10.2-MDEV-26545bb-10.2-mdev-26545
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 7d1f630b88c..e5165c5a855 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -426,8 +426,10 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref) error= dd_recreate_table(thd, table_ref->db, table_ref->table_name); 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; + } /* No need to binlog a failed truncate-by-recreate. */ binlog_stmt= !error; } |