summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 102c21d19a0..393c2356404 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -7021,7 +7021,6 @@ int ndbcluster_find_files(handlerton *hton, THD *thd,
// Lock mutex before deleting and creating frm files
pthread_mutex_lock(&LOCK_open);
-
if (!global_read_lock)
{
// Delete old files
@@ -7035,10 +7034,12 @@ int ndbcluster_find_files(handlerton *hton, THD *thd,
table_list.db= (char*) db;
table_list.alias= table_list.table_name= (char*)file_name;
(void)mysql_rm_table_part2(thd, &table_list,
- /* if_exists */ FALSE,
- /* drop_temporary */ FALSE,
- /* drop_view */ FALSE,
- /* dont_log_query*/ TRUE);
+ FALSE, /* if_exists */
+ FALSE, /* drop_temporary */
+ FALSE, /* drop_view */
+ TRUE, /* dont_log_query*/
+ FALSE); /* need lock open */
+
/* Clear error message that is returned when table is deleted */
thd->clear_error();
}
@@ -7054,7 +7055,7 @@ int ndbcluster_find_files(handlerton *hton, THD *thd,
}
pthread_mutex_unlock(&LOCK_open);
-
+
hash_free(&ok_tables);
hash_free(&ndb_tables);