summaryrefslogtreecommitdiff
path: root/sql/sql_partition_admin.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 09:26:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 09:26:40 +0300
commit9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (patch)
tree1adb4d44b9b7e7cf20e63e3ebc95ba05f7dc47e9 /sql/sql_partition_admin.cc
parent5b79303b40e31d77f616c2b797f58de41973e6a3 (diff)
parentc7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff)
downloadmariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_partition_admin.cc')
-rw-r--r--sql/sql_partition_admin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index e850677f8d9..1ac9e748d42 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -652,7 +652,7 @@ bool Sql_cmd_alter_table_exchange_partition::
better to keep master/slave in consistent state. Alternative would be to
try to revert the exchange operation and issue error.
*/
- (void) thd->locked_tables_list.reopen_tables(thd);
+ (void) thd->locked_tables_list.reopen_tables(thd, false);
if ((error= write_bin_log(thd, TRUE, thd->query(), thd->query_length())))
{