diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
| commit | 7396dfcca7a1eb906edabec02fb59d168f09343d (patch) | |
| tree | 5971546f2d27f5a8dc186e0f63ae3d2ac9208a6a /sql/sql_truncate.cc | |
| parent | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff) | |
| parent | 7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff) | |
| download | mariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz | |
Merge 10.2 into 10.3
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 2ddb4bc042c..249a6e21ffc 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 @@ -427,7 +427,7 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref) */ error= dd_recreate_table(thd, table_ref->db.str, table_ref->table_name.str); - 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); } - |