mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
This commit is contained in:
magnus@neptunus.(none) 2004-10-07 11:57:47 +02:00
commit 6bbf1f8ee4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/kernel/vm/Configuration.cpp
View file

@ -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();

4
sql/ha_ndbcluster.cc
View file

@ -3948,8 +3948,8 @@ 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);
files->push_back(thd->strdup(file_name));
if (ha_create_table_from_engine(thd, db, file_name, true) == 0)
files->push_back(thd->strdup(file_name));
}
pthread_mutex_unlock(&LOCK_open);