Commit 2417cdbf authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
parents 329761e8 d490e4de

sql/ha_ndbcluster.cc

+14 −5
Original line number Diff line number Diff line
@@ -4479,6 +4479,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));
@@ -4505,10 +4506,18 @@ 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)

      {

        ERR_PRINT(err);

        ret= ndb_to_mysql_error(&err);

      }

    }

  }

  DBUG_RETURN(ret);      

}