bk commit into 5.1 tree (jonas:1.2534)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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, 2008-02-20 15:08:20+01:00, jonas@stripped +3 -0
  ndb -
    Fix error insert codes what had been incorrectly merged

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2008-02-20 15:08:18+01:00,
jonas@stripped +9 -4
    Fix error insert codes what had been incorrectly merged

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2008-02-20 15:08:18+01:00,
jonas@stripped +9 -9
    Fix error insert codes what had been incorrectly merged

  storage/ndb/test/ndbapi/test_event.cpp@stripped, 2008-02-20 15:08:18+01:00,
jonas@stripped +8 -6
    Fix error insert codes what had been incorrectly merged

diff -Nrup a/storage/ndb/src/kernel/blocks/ERROR_codes.txt
b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
--- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-02-11 15:07:48 +01:00
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-02-20 15:08:18 +01:00
@@ -11,7 +11,7 @@ Next CMVMI 9000
 Next BACKUP 10038
 Next DBUTIL 11002
 Next DBTUX 12008
-Next SUMA 13037
+Next SUMA 13043
 Next LGMAN 15001
 Next TSMAN 16001
 
@@ -575,9 +575,14 @@ NDBCNTR:
 1001: Delay sending NODE_FAILREP (to own node), until error is cleared
 
 SUMA:
-13034: Simulate report MISSING_DATA at node failure
-13035: Simulate disconnect lagging subscribers
-13036: Simulate out of event buffer
+13036: Simulate report MISSING_DATA at node failure
+13037: Simulate disconnect lagging subscribers
+13038: Simulate out of event buffer
+
+13039: Crash i DICT_LOCKCONF
+13040: Crash in SUB_CREATE_REQ if m_restart_server_node_id != RNIL
+13041: Crash in SUB_CREATE_REQ (no matter)
+13042: Crash in SUB_START_REQ (if m_restart_server_node_id != 0)
 
 LGMAN:
 -----
diff -Nrup a/storage/ndb/src/kernel/blocks/suma/Suma.cpp
b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-02-20 10:04:24 +01:00
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-02-20 15:08:18 +01:00
@@ -428,7 +428,7 @@ Suma::execDICT_LOCK_CONF(Signal* signal)
   jamEntry();
   c_startup.m_restart_server_node_id = 0;
 
-  CRASH_INSERTION(13034);
+  CRASH_INSERTION(13039);
   send_start_me_req(signal);
 }
 
@@ -1493,8 +1493,8 @@ Suma::execSUB_CREATE_REQ(Signal* signal)
     return;
   }
 
-  CRASH_INSERTION2(13035, c_startup.m_restart_server_node_id != RNIL);
-  CRASH_INSERTION(13036);
+  CRASH_INSERTION2(13040, c_startup.m_restart_server_node_id != RNIL);
+  CRASH_INSERTION(13041);
   
   bool allowDup = true; //c_startup.m_restart_server_node_id;
 
@@ -2325,7 +2325,7 @@ Suma::execSUB_START_REQ(Signal* signal){
     return;
   }
 
-  CRASH_INSERTION2(13037, c_startup.m_restart_server_node_id != 0);
+  CRASH_INSERTION2(13042, getNodeState().startLevel == NodeState::SL_STARTING);
   
   bool found = c_subscriptions.find(subPtr, key);
   if (!found)
@@ -3547,7 +3547,7 @@ Suma::checkMaxBufferedGCP(Signal *signal
   }
   Ptr<Gcp_record> gcp;
   c_gcp_list.first(gcp);
-  if (ERROR_INSERTED(13035))
+  if (ERROR_INSERTED(13037))
   {
     jam();
     CLEAR_ERROR_INSERT_VALUE;
@@ -3619,7 +3619,7 @@ Suma::execSUB_GCP_COMPLETE_REP(Signal* s
                  ? rep->flags | SubGcpCompleteRep::MISSING_DATA
                  : rep->flags;
 
-  if (ERROR_INSERTED(13034))
+  if (ERROR_INSERTED(13036))
   {
     jam();
     CLEAR_ERROR_INSERT_VALUE;
@@ -3964,7 +3964,7 @@ Suma::execSUB_GCP_COMPLETE_ACK(Signal* s
   Uint64 gci = gci_lo | (Uint64(gci_hi) << 32);
   m_max_seen_gci = (gci > m_max_seen_gci ? gci : m_max_seen_gci);
 
-  if (ERROR_INSERTED(13035))
+  if (ERROR_INSERTED(13037))
   {
     jam();
     ndbout_c("Simulating exceeding the MaxBufferedEpochs, ignoring ack");
@@ -4808,7 +4808,7 @@ Suma::out_of_buffer_release(Signal* sign
 Uint32
 Suma::seize_page()
 {
-  if (ERROR_INSERTED(13036))
+  if (ERROR_INSERTED(13038))
   {
     jam();
     CLEAR_ERROR_INSERT_VALUE;
@@ -5116,7 +5116,7 @@ Suma::resend_bucket(Signal* signal, Uint
       rep->senderRef  = reference();
       rep->gcp_complete_rep_count = 1;
 
-      if (ERROR_INSERTED(13034))
+      if (ERROR_INSERTED(13036))
       {
         jam();
         CLEAR_ERROR_INSERT_VALUE;
diff -Nrup a/storage/ndb/test/ndbapi/test_event.cpp
b/storage/ndb/test/ndbapi/test_event.cpp
--- a/storage/ndb/test/ndbapi/test_event.cpp	2008-02-20 10:04:25 +01:00
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2008-02-20 15:08:18 +01:00
@@ -1871,7 +1871,7 @@ errorInjectBufferOverflow(NDBT_Context* 
     return NDBT_FAILED;
   }
 
-  if (restarter.insertErrorInAllNodes(13034) != 0)
+  if (restarter.insertErrorInAllNodes(13036) != 0)
   {
     result = NDBT_FAILED;
     goto cleanup;
@@ -1931,7 +1931,7 @@ errorInjectStalling(NDBT_Context* ctx, N
     return NDBT_FAILED;
   }
 
-  if (restarter.insertErrorInAllNodes(13035) != 0)
+  if (restarter.insertErrorInAllNodes(13037) != 0)
   {
     result = NDBT_FAILED;
     goto cleanup;
@@ -2094,14 +2094,14 @@ runNFSubscribe(NDBT_Context* ctx, NDBT_S
     13013,
     13019,
     13020,
-    13036,
+    13041,
     0,
   };
 
   int nr_codes[] = {
-    13034,
-    13035,
-    13037,
+    13039,
+    13040,
+    13042,
     0
   };
 
@@ -2152,6 +2152,8 @@ runNFSubscribe(NDBT_Context* ctx, NDBT_S
       
       if (restarter.startNodes(&nodeId, 1))
         return NDBT_FAILED;
+
+      NdbSleep_SecSleep(3);
       
       if (restarter.waitNodesNoStart(&nodeId, 1))
         return NDBT_FAILED;