Commit 32d2b6ed authored by unknown's avatar unknown
Browse files

Post review fix of ndbcluster_drop_database

parent 20cf8f82

sql/ha_ndbcluster.cc

+11 −5
Original line number Diff line number Diff line
@@ -4327,6 +4327,7 @@ int ndbcluster_drop_database(const char *path) 
  uint i;

  char *tabname;

  List<char> drop_list;

  int ret= 0;

  ha_ndbcluster::set_dbname(path, (char *)&dbname);

  DBUG_PRINT("enter", ("db: %s", dbname));
@@ -4353,10 +4354,15 @@ int ndbcluster_drop_database(const char *path) 
  ndb->setDatabaseName(dbname);

  List_iterator_fast<char> it(drop_list);

  while ((tabname=it++))

    if (dict->dropTable(tabname))

      ERR_RETURN(dict->getNdbError());      



  DBUG_RETURN(0);

  {

    if (!dict->dropTable(tabname))

    {

      const NdbError err= dict->getNdbError();

      if (err.code != 709)

        ret= ndb_to_mysql_error(&err);

    }

  }

  DBUG_RETURN(ret);      

}