mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table

Browse source
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-03-23 17:12:06 +01:00
parent aadd161d65
commit df278bd605
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sql/ha_ndbcluster.cc
View file

@ -4742,6 +4742,7 @@ int ha_ndbcluster::create(const char *name,
bool create_from_engine= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
bool is_truncate= (thd->lex->sql_command == SQLCOM_TRUNCATE);
char tablespace[FN_LEN];
NdbDictionary::Table::SingleUserMode single_user_mode= NdbDictionary::Table::SingleUserModeLocked;
DBUG_ENTER("ha_ndbcluster::create");
DBUG_PRINT("enter", ("name: %s", name));
@ -4793,19 +4794,23 @@ int ha_ndbcluster::create(const char *name,
schema distribution table is setup
( unless it is a creation of the schema dist table itself )
*/
if (!ndb_schema_share &&
!(strcmp(m_dbname, NDB_REP_DB) == 0 &&
strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0))
if (!ndb_schema_share)
{
DBUG_PRINT("info", ("Schema distribution table not setup"));
DBUG_RETURN(HA_ERR_NO_CONNECTION);
if (!(strcmp(m_dbname, NDB_REP_DB) == 0 &&
strcmp(m_tabname, NDB_SCHEMA_TABLE) == 0))
{
DBUG_PRINT("info", ("Schema distribution table not setup"));
DBUG_RETURN(HA_ERR_NO_CONNECTION);
}
single_user_mode = NdbDictionary::Table::SingleUserModeReadWrite;
}
#endif /* HAVE_NDB_BINLOG */
DBUG_PRINT("table", ("name: %s", m_tabname));
tab.setName(m_tabname);
tab.setLogging(!(create_info->options & HA_LEX_CREATE_TMP_TABLE));
tab.setSingleUserMode(single_user_mode);
// Save frm data for this table
if (readfrm(name, &data, &length))
DBUG_RETURN(1);
@ -5569,6 +5574,7 @@ retry_temporary_error1:
{
ndb_table_id= h->m_table->getObjectId();
ndb_table_version= h->m_table->getObjectVersion();
DBUG_PRINT("info", ("success 1"));
}
else
{
@ -5582,6 +5588,7 @@ retry_temporary_error1:
break;
}
res= ndb_to_mysql_error(&dict->getNdbError());
DBUG_PRINT("info", ("error(1) %u", res));
}
h->release_metadata(thd, ndb);
}
@ -5598,6 +5605,8 @@ retry_temporary_error1:
{
ndb_table_id= ndbtab_g.get_table()->getObjectId();
ndb_table_version= ndbtab_g.get_table()->getObjectVersion();
DBUG_PRINT("info", ("success 2"));
break;
}
else
{
@ -5617,8 +5626,8 @@ retry_temporary_error1:
}
}
}
else
res= ndb_to_mysql_error(&dict->getNdbError());
res= ndb_to_mysql_error(&dict->getNdbError());
DBUG_PRINT("info", ("error(2) %u", res));
break;
}
}

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

@ -51,7 +51,7 @@
#define ERR_RETURN(a,b) \
{\
DBUG_PRINT("exit", ("error %d", (a).code));\
DBUG_PRINT("exit", ("error %d return %d", (a).code, b));\
DBUG_RETURN(b);\
}