Commit 023f4435 authored by pekka@orca.ndb.mysql.com's avatar pekka@orca.ndb.mysql.com

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
parents 4fbf8f2f bdc7a14b
...@@ -602,7 +602,9 @@ Dbtup::execDROP_TAB_REQ(Signal* signal) ...@@ -602,7 +602,9 @@ Dbtup::execDROP_TAB_REQ(Signal* signal)
{ {
ljamEntry(); ljamEntry();
if (ERROR_INSERTED(4013)) { if (ERROR_INSERTED(4013)) {
#ifdef VM_TRACE
verifytabdes(); verifytabdes();
#endif
} }
DropTabReq* req = (DropTabReq*)signal->getDataPtr(); DropTabReq* req = (DropTabReq*)signal->getDataPtr();
...@@ -724,7 +726,9 @@ void Dbtup::execFSREMOVECONF(Signal* signal) ...@@ -724,7 +726,9 @@ void Dbtup::execFSREMOVECONF(Signal* signal)
initTab(tabPtr.p); initTab(tabPtr.p);
if (ERROR_INSERTED(4013)) { if (ERROR_INSERTED(4013)) {
CLEAR_ERROR_INSERT_VALUE; CLEAR_ERROR_INSERT_VALUE;
#ifdef VM_TRACE
verifytabdes(); verifytabdes();
#endif
} }
}//Dbtup::execFSREMOVECONF() }//Dbtup::execFSREMOVECONF()
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