MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:pekka Date:June 22 2006 5:26pm
Subject:bk commit into 5.1 tree (pekka:1.2205) BUG#18781
View as plain text  
Below is the list of changes that have just been committed into a local
5.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
  1.2205 06/06/22 19:26:15 pekka@stripped +7 -0
  ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
        have to push this to be able to push 5.0

  storage/ndb/test/src/NdbRestarter.cpp
    1.14 06/06/22 19:24:17 pekka@stripped +4 -1
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/test/ndbapi/testDict.cpp
    1.29 06/06/22 19:24:17 pekka@stripped +6 -3
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/src/ndbapi/ndberror.c
    1.63 06/06/22 19:24:17 pekka@stripped +1 -0
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.65 06/06/22 19:24:16 pekka@stripped +11 -7
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.33 06/06/22 19:21:59 pekka@stripped +1 -0
    debug

  storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
    1.3 06/06/15 15:31:14 pekka@stripped +0 -0
    Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt

  storage/ndb/include/kernel/signaldata/DictLock.hpp
    1.4 06/06/15 15:30:31 pekka@stripped +0 -0
    Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp

# 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/pekka/ndb/version/my51-bug18781

--- 1.32/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-06-15 14:33:00 +02:00
+++ 1.33/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-06-22 19:21:59 +02:00
@@ -1082,6 +1082,7 @@ private:
     BlockState& operator=(const BlockState& bs) {
       Dbdict* dict = (Dbdict*)globalData.getBlock(DBDICT);
       dict->infoEvent("DICT: bs %d->%d", m_value, bs.m_value);
+      globalSignalLoggers.log(DBDICT, "bs %d->%d", m_value, bs.m_value);
       m_value = bs.m_value;
       return *this;
     }

--- 1.64/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-15 14:40:16 +02:00
+++ 1.65/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-22 19:24:16 +02:00
@@ -15055,13 +15055,14 @@ Dbdih::sendDictLockReq(Signal* signal, U
   {
     Uint32 masterVersion = getNodeInfo(cmasterNodeId).m_version;
 
-    unsigned int get_major = getMajor(masterVersion);
-    unsigned int get_minor = getMinor(masterVersion);
-    unsigned int get_build = getBuild(masterVersion);
-
-    ndbrequire(get_major == 4 || get_major == 5);
+    const unsigned int get_major = getMajor(masterVersion);
+    const unsigned int get_minor = getMinor(masterVersion);
+    const unsigned int get_build = getBuild(masterVersion);
+    ndbrequire(get_major >= 4);
 
     if (masterVersion < NDBD_DICT_LOCK_VERSION_5 ||
+        masterVersion < NDBD_DICT_LOCK_VERSION_5_1 &&
+          get_major == 5 && get_minor == 1 ||
         ERROR_INSERTED(7176)) {
       jam();
 
@@ -15132,10 +15133,13 @@ Dbdih::sendDictUnlockOrd(Signal* signal,
   {
     Uint32 masterVersion = getNodeInfo(cmasterNodeId).m_version;
 
-    unsigned int get_major = getMajor(masterVersion);
-    ndbrequire(get_major == 4 || get_major == 5);
+    const unsigned int get_major = getMajor(masterVersion);
+    const unsigned int get_minor = getMinor(masterVersion);
+    ndbrequire(get_major >= 4);
 
     if (masterVersion < NDBD_DICT_LOCK_VERSION_5 ||
+        masterVersion < NDBD_DICT_LOCK_VERSION_5_1 &&
+          get_major == 5 && get_minor == 1 ||
         ERROR_INSERTED(7176)) {
       return;
     }

--- 1.28/storage/ndb/test/ndbapi/testDict.cpp	2006-06-15 14:49:31 +02:00
+++ 1.29/storage/ndb/test/ndbapi/testDict.cpp	2006-06-22 19:24:17 +02:00
@@ -1852,7 +1852,9 @@ runDictOps(NDBT_Context* ctx, NDBT_Step*
     Ndb* pNdb = GETNDB(step);
     NdbDictionary::Dictionary* pDic = pNdb->getDictionary();
     const NdbDictionary::Table* pTab = ctx->getTab();
-    const char* tabName = pTab->getName();
+    //const char* tabName = pTab->getName(); //XXX what goes on?
+    char tabName[40];
+    strcpy(tabName, pTab->getName());
 
     const unsigned long maxsleep = 100; //ms
 
@@ -1888,7 +1890,7 @@ runDictOps(NDBT_Context* ctx, NDBT_Step*
     // replace by the Retrieved table
     pTab = pTab2;
 
-    int records = myRandom48(ctx->getNumRecords());
+    int records = ctx->getNumRecords();
     g_info << "2: load " << records << " records" << endl;
     HugoTransactions hugoTrans(*pTab);
     if (hugoTrans.loadTable(pNdb, records) != 0) {
@@ -1925,7 +1927,8 @@ runDictOps(NDBT_Context* ctx, NDBT_Step*
       result = NDBT_FAILED;
       break;
     }
-    if (pDic->getNdbError().code != 709) {
+    if (pDic->getNdbError().code != 709 &&
+        pDic->getNdbError().code != 723) {
       const NdbError err = pDic->getNdbError();
       g_err << "2: " << tabName << ": verify drop: " << err << endl;
       result = NDBT_FAILED;

--- 1.13/storage/ndb/test/src/NdbRestarter.cpp	2006-03-24 07:35:36 +01:00
+++ 1.14/storage/ndb/test/src/NdbRestarter.cpp	2006-06-22 19:24:17 +02:00
@@ -329,7 +329,10 @@ NdbRestarter::waitNodesState(int * _node
       }
 
       g_info << "State node " << ndbNode->node_id << " "
-	     << ndb_mgm_get_node_status_string(ndbNode->node_status)<< endl;
+	     << ndb_mgm_get_node_status_string(ndbNode->node_status);
+      if (ndbNode->node_status == NDB_MGM_NODE_STATUS_STARTING)
+        g_info<< ", start_phase=" << ndbNode->start_phase;
+      g_info << endl;
 
       assert(ndbNode != NULL);
 

--- 1.62/storage/ndb/src/ndbapi/ndberror.c	2006-06-15 14:48:54 +02:00
+++ 1.63/storage/ndb/src/ndbapi/ndberror.c	2006-06-22 19:24:17 +02:00
@@ -214,6 +214,7 @@ ErrorBundle ErrorCodes[] = {
    * OverloadError
    */
   { 701,  DMEC, OL, "System busy with other schema operation" },
+  { 711,  DMEC, OL, "System busy with node restart, schema operations not allowed" },
   { 410,  DMEC, OL, "REDO log files overloaded, consult online manual (decrease TimeBetweenLocalCheckpoints, and|or increase NoOfFragmentLogFiles)" },
   { 677,  DMEC, OL, "Index UNDO buffers overloaded (increase UndoIndexBuffer)" },
   { 891,  DMEC, OL, "Data UNDO buffers overloaded (increase UndoDataBuffer)" },
Thread
bk commit into 5.1 tree (pekka:1.2205) BUG#18781pekka22 Jun