mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug19203-5.1-new-ndb-bj
This commit is contained in:
commit
c4151cc450
1 changed files with 14 additions and 2 deletions
|
@ -3249,8 +3249,20 @@ Dbdict::restartCreateTab_dihComplete(Signal* signal,
|
||||||
CreateTableRecordPtr createTabPtr;
|
CreateTableRecordPtr createTabPtr;
|
||||||
ndbrequire(c_opCreateTable.find(createTabPtr, callbackData));
|
ndbrequire(c_opCreateTable.find(createTabPtr, callbackData));
|
||||||
|
|
||||||
//@todo check error
|
fprintf(stderr,"Dbdict:restartCreateTab_dihComplete:, errorCode=%d\n", createTabPtr.p->m_errorCode);
|
||||||
ndbrequire(createTabPtr.p->m_errorCode == 0);
|
if (createTabPtr.p->m_errorCode != 0)
|
||||||
|
{
|
||||||
|
char buf[255];
|
||||||
|
BaseString::snprintf(buf, sizeof(buf),
|
||||||
|
"Unable to restart, fail while creating table"
|
||||||
|
" error: %d. Most likely change of configuration",
|
||||||
|
createTabPtr.p->m_errorCode);
|
||||||
|
progError(__LINE__,
|
||||||
|
NDBD_EXIT_INVALID_CONFIG,
|
||||||
|
buf);
|
||||||
|
ndbrequire(createTabPtr.p->m_errorCode == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Callback callback;
|
Callback callback;
|
||||||
callback.m_callbackData = callbackData;
|
callback.m_callbackData = callbackData;
|
||||||
|
|
Loading…
Reference in a new issue