Commit 75a4dc96 authored by mskold@mysql.com's avatar mskold@mysql.com

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
parents db9df141 9795e7ed
...@@ -2227,7 +2227,6 @@ void Dbdict::checkSchemaStatus(Signal* signal) ...@@ -2227,7 +2227,6 @@ void Dbdict::checkSchemaStatus(Signal* signal)
restartCreateTab(signal, tableId, oldEntry, false); restartCreateTab(signal, tableId, oldEntry, false);
return; return;
}//if }//if
ndbrequire(ok);
break; break;
} }
} }
...@@ -2452,7 +2451,9 @@ Dbdict::restartCreateTab_writeTableConf(Signal* signal, ...@@ -2452,7 +2451,9 @@ Dbdict::restartCreateTab_writeTableConf(Signal* signal,
callback.m_callbackFunction = callback.m_callbackFunction =
safe_cast(&Dbdict::restartCreateTab_dihComplete); safe_cast(&Dbdict::restartCreateTab_dihComplete);
SegmentedSectionPtr fragDataPtr; fragDataPtr.setNull(); SegmentedSectionPtr fragDataPtr;
fragDataPtr.sz = 0;
fragDataPtr.setNull();
createTab_dih(signal, createTabPtr, fragDataPtr, &callback); createTab_dih(signal, createTabPtr, fragDataPtr, &callback);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment