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_partition.cc | |
| parent | 5b79303b40e31d77f616c2b797f58de41973e6a3 (diff) | |
| parent | c7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff) | |
| download | mariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 13e5f16685c..65c76127de9 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2005, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, SkySQL Ab. + Copyright (c) 2009, 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 @@ -6555,7 +6555,7 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt) thd->set_stmt_da(&tmp_stmt_da); } - if (thd->locked_tables_list.reopen_tables(thd)) + if (thd->locked_tables_list.reopen_tables(thd, false)) sql_print_warning("We failed to reacquire LOCKs in ALTER TABLE"); if (stmt_da) @@ -6759,7 +6759,7 @@ err_exclusive_lock: thd->set_stmt_da(&tmp_stmt_da); } - if (thd->locked_tables_list.reopen_tables(thd)) + if (thd->locked_tables_list.reopen_tables(thd, false)) sql_print_warning("We failed to reacquire LOCKs in ALTER TABLE"); if (stmt_da) |