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

Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
This commit is contained in:
unknown 2006-03-24 10:12:35 +01:00
commit d592337739
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sql/ha_ndbcluster_binlog.cc
View file

@ -765,16 +765,6 @@ static int ndbcluster_create_schema_table(THD *thd)
void ndbcluster_setup_binlog_table_shares(THD *thd)
{
int done_find_all_files= 0;
if (!apply_status_share &&
ndbcluster_check_apply_status_share() == 0)
{
if (!done_find_all_files)
{
ndbcluster_find_all_files(thd);
done_find_all_files= 1;
}
ndbcluster_create_apply_status_table(thd);
}
if (!schema_share &&
ndbcluster_check_schema_share() == 0)
{
@ -784,6 +774,19 @@ void ndbcluster_setup_binlog_table_shares(THD *thd)
done_find_all_files= 1;
}
ndbcluster_create_schema_table(thd);
// always make sure we create the 'schema' first
if (!schema_share)
return;
}
if (!apply_status_share &&
ndbcluster_check_apply_status_share() == 0)
{
if (!done_find_all_files)
{
ndbcluster_find_all_files(thd);
done_find_all_files= 1;
}
ndbcluster_create_apply_status_table(thd);
}
}

2
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file

@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName)
int ret = getBlobTables(*impl);
if (ret != 0) {
delete impl;
return 0;
impl = 0;
}
}