Commit 32d2b6ed authored by unknown's avatar unknown

Post review fix of ndbcluster_drop_database

parent 20cf8f82
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -4327,6 +4327,7 @@ int ndbcluster_drop_database(const char *path) ...@@ -4327,6 +4327,7 @@ int ndbcluster_drop_database(const char *path)
uint i; uint i;
char *tabname; char *tabname;
List<char> drop_list; List<char> drop_list;
int ret= 0;
ha_ndbcluster::set_dbname(path, (char *)&dbname); ha_ndbcluster::set_dbname(path, (char *)&dbname);
DBUG_PRINT("enter", ("db: %s", dbname)); DBUG_PRINT("enter", ("db: %s", dbname));
...@@ -4353,10 +4354,15 @@ int ndbcluster_drop_database(const char *path) ...@@ -4353,10 +4354,15 @@ int ndbcluster_drop_database(const char *path)
ndb->setDatabaseName(dbname); ndb->setDatabaseName(dbname);
List_iterator_fast<char> it(drop_list); List_iterator_fast<char> it(drop_list);
while ((tabname=it++)) while ((tabname=it++))
if (dict->dropTable(tabname)) {
ERR_RETURN(dict->getNdbError()); if (!dict->dropTable(tabname))
{
DBUG_RETURN(0); const NdbError err= dict->getNdbError();
if (err.code != 709)
ret= ndb_to_mysql_error(&err);
}
}
DBUG_RETURN(ret);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment