Commit a4475441 authored by unknown's avatar unknown
Browse files

Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents d36d5a29 7116e39f

ndb/src/kernel/vm/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ Configuration::fetch_configuration(LocalConfig &local_config){ 
    /* Set stop on error to true otherwise NDB will

       go into an restart loop...

    */

    ERROR_SET(fatal, ERR_INVALID_CONFIG, "Could connect to ndb_mgmd", s);

    ERROR_SET(fatal, ERR_INVALID_CONFIG, "Could not connect to ndb_mgmd", s);

  }

  

  m_mgmd_port= m_config_retriever->get_mgmd_port();

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -3948,7 +3948,7 @@ int ndbcluster_find_files(THD *thd,const char *db,const char *path, 
  while ((file_name=it2++))

  {  

    DBUG_PRINT("info", ("Table %s need discovery", name));

    ha_create_table_from_engine(thd, db, file_name, true);    

    if (ha_create_table_from_engine(thd, db, file_name, true) == 0)

      files->push_back(thd->strdup(file_name)); 

  }