From: Date: July 10 2006 12:05pm Subject: bk commit into 4.1 tree (pekka:1.2532) BUG#20847 List-Archive: http://lists.mysql.com/commits/8977 X-Bug: 20847 Message-Id: <200607101005.k6AA5xt6029042@orca.ndb.mysql.com> Below is the list of changes that have just been committed into a local 4.1 repository of pekka. When pekka does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2006-07-10 12:05:51+02:00, pekka@stripped +1 -0 ndb - bug#20847: non-debug compile fix ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2006-07-10 12:04:48+02:00, pekka@stripped +4 -0 non-debug compile fix # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: pekka # Host: orca.ndb.mysql.com # Root: /space_old/pekka/ndb/version/my41 --- 1.9/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2006-07-10 12:06:01 +02:00 +++ 1.10/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2006-07-10 12:06:01 +02:00 @@ -568,7 +568,9 @@ { ljamEntry(); if (ERROR_INSERTED(4013)) { +#ifdef VM_TRACE verifytabdes(); +#endif } DropTabReq* req = (DropTabReq*)signal->getDataPtr(); @@ -690,7 +692,9 @@ initTab(tabPtr.p); if (ERROR_INSERTED(4013)) { CLEAR_ERROR_INSERT_VALUE; +#ifdef VM_TRACE verifytabdes(); +#endif } }//Dbtup::execFSREMOVECONF()