- corrected bug causing hang in getTable when using blob tables
- 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:
parent
a4962ed022
commit
c2e4ef092b
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName)
|
||||
int ret = getBlobTables(*impl);
|
||||
if (ret != 0) {
|
||||
delete impl;
|
||||
return 0;
|
||||
impl = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user