diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
| commit | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (patch) | |
| tree | 1adb4d44b9b7e7cf20e63e3ebc95ba05f7dc47e9 /sql/sql_truncate.cc | |
| parent | 5b79303b40e31d77f616c2b797f58de41973e6a3 (diff) | |
| parent | c7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff) | |
| download | mariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz | |
Merge 10.0 into 10.1
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 c08c75f771a..8a70e6f6bdb 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2010, 2015, Oracle and/or its affiliates. - Copyright (c) 2013, 2015, MariaDB + Copyright (c) 2012, 2018, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -426,7 +426,7 @@ 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)) + if (thd->locked_tables_mode && thd->locked_tables_list.reopen_tables(thd, false)) thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0); /* No need to binlog a failed truncate-by-recreate. */ @@ -500,4 +500,3 @@ bool Sql_cmd_truncate_table::execute(THD *thd) DBUG_RETURN(res); } - |