bk commit into 5.0 tree (pekka:1.1954)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 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
  1.1954 05/07/19 10:49:45 pekka@stripped +2 -0
  ndb - DICT minor

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.47 05/07/19 10:49:03 pekka@stripped +6 -3
    downgrade some require to assert

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.12 05/07/19 10:49:03 pekka@stripped +3 -2
    downgrade some require to assert

# 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:	clam.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my50-ndb

--- 1.11/ndb/src/kernel/blocks/ERROR_codes.txt	2005-07-19 03:59:55 +02:00
+++ 1.12/ndb/src/kernel/blocks/ERROR_codes.txt	2005-07-19 10:49:03 +02:00
@@ -4,9 +4,9 @@
 Next DBACC 3002
 Next DBTUP 4013
 Next DBLQH 5042
-Next DBDICT 6006
+Next DBDICT 6007
 Next DBDIH 7174
-Next DBTC 8035
+Next DBTC 8037
 Next CMVMI 9000
 Next BACKUP 10022
 Next DBUTIL 11002
@@ -413,6 +413,7 @@
 8034: Fail next index create in TC
 8035: Fail next trigger drop in TC
 8036: Fail next index drop in TC
+6006: Crash participant in create index
 
 System Restart:
 ---------------

--- 1.46/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-19 03:59:55 +02:00
+++ 1.47/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-19 10:49:03 +02:00
@@ -6468,6 +6468,9 @@
 Dbdict::createIndex_slavePrepare(Signal* signal, OpCreateIndexPtr opPtr)
 {
   jam();
+  if (ERROR_INSERTED(6006) && ! opPtr.p->m_isMaster) {
+    ndbrequire(false);
+  }
 }
 
 void
@@ -9668,7 +9671,7 @@
   // broken index allowed if force
   if (! (indexPtr.p->indexLocal & TableRecord::IL_CREATED_TC)) {
     jam();
-    ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
+    ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
     alterIndex_sendReply(signal, opPtr, false);
     return;
   }
@@ -11719,7 +11722,7 @@
     // broken trigger allowed if force
     if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_TC)) {
       jam();
-      ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
+      ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
       alterTrigger_sendReply(signal, opPtr, false);
       return;
     }
@@ -11729,7 +11732,7 @@
     // broken trigger allowed if force
     if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_LQH)) {
       jam();
-      ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
+      ndbassert(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
       alterTrigger_sendReply(signal, opPtr, false);
       return;
     }