1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- corrected bug causing hang in getTable when using blob tables

Browse Source 
- make sure cluster/schema table is always created first


sql/ha_ndbcluster_binlog.cc:
  make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug causing hang in getTable when using blob tables
This commit is contained in:
unknown 2006-03-24 10:12:34 +01:00
parent a4962ed022
commit c2e4ef092b
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) void ndbcluster_setup_binlog_table_shares(THD *thd)
{ {
int done_find_all_files= 0; 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 && if (!schema_share &&
ndbcluster_check_schema_share() == 0) ndbcluster_check_schema_share() == 0)
{ {
@ -784,6 +774,19 @@ void ndbcluster_setup_binlog_table_shares(THD *thd)
done_find_all_files= 1; done_find_all_files= 1;
} }
ndbcluster_create_schema_table(thd); 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); int ret = getBlobTables(*impl);
if (ret != 0) { if (ret != 0) {
delete impl; delete impl;
return 0; impl = 0;
} }
} }