bzr push into mysql-5.1-telco-7.1 branch (jonas:4094 to 4095)

[jonas oreland]

 4095 jonas oreland	2011-02-19 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/run-test/conf-dl145a.cnf
      storage/ndb/test/run-test/conf-ndb07.cnf
 4094 Martin Zaun	2011-02-18 [merge]
      merge from 7.0 to 7.1

    added:
      storage/ndb/include/util/NdbTypesUtil.hpp
    modified:
      storage/ndb/include/util/NdbSqlUtil.hpp
      storage/ndb/tools/restore/consumer_restore.cpp
      storage/ndb/tools/restore/consumer_restore.hpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-18 19:43:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2011-02-19 14:26:13 +0000
@@ -1993,6 +1993,9 @@ void Dbdih::execREAD_NODESCONF(Signal* s
     printf("Checking 2-pass initial node restart: ");
     for (i = 0; i<index; i++)
     {
+      if (NdbNodeBitmask::get(readNodes->inactiveNodes, nodeArray[i]))
+        continue;
+
       if (!ndbd_non_trans_copy_frag_req(getNodeInfo(nodeArray[i]).m_version))
       {
         jam();

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-02-18 19:43:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-02-19 14:26:13 +0000
@@ -16709,7 +16709,18 @@ void Dblqh::execSTART_RECREQ(Signal* sig
     lcpPtr.i = 0;
     ptrAss(lcpPtr, lcpRecord);
     lcpPtr.p->m_outstanding = 1;
-    
+
+    if (cstartType == NodeState::ST_INITIAL_NODE_RESTART)
+    {
+      jam();
+      /**
+       * Skip lgman undo...
+       */
+      signal->theData[0] = LGMAN_REF;
+      sendSignal(reference(), GSN_START_RECCONF, signal, 1, JBB);
+      return;
+    }
+
     if (!isNdbMtLqh())
     {
       jam();

=== modified file 'storage/ndb/test/run-test/conf-dl145a.cnf'
--- a/storage/ndb/test/run-test/conf-dl145a.cnf	2011-02-15 11:41:27 +0000
+++ b/storage/ndb/test/run-test/conf-dl145a.cnf	2011-02-19 10:31:42 +0000
@@ -32,3 +32,6 @@ SharedGlobalMemory=256M
 InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:256M;undofile02.dat:128M
 InitialTablespace=datafile01.dat:128M;datafile02.dat:64M
 TwoPassInitialNodeRestartCopy=1
+
+[cluster_config.ndbd.1.2node]
+TwoPassInitialNodeRestartCopy=1

=== modified file 'storage/ndb/test/run-test/conf-ndb07.cnf'
--- a/storage/ndb/test/run-test/conf-ndb07.cnf	2011-02-15 11:41:27 +0000
+++ b/storage/ndb/test/run-test/conf-ndb07.cnf	2011-02-19 10:31:42 +0000
@@ -39,4 +39,9 @@ FileSystemPathDataFiles=/data1/autotest
 FileSystemPathUndoFiles=/data2/autotest
 InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:256M;undofile02.dat:256M
 InitialTablespace=datafile01.dat:256M;datafile02.dat:256M
+
+[cluster_config.ndbd.1.2node]
+TwoPassInitialNodeRestartCopy=1
+
+[cluster_config.ndbd.3.2node]
 TwoPassInitialNodeRestartCopy=1

No bundle (reason: useless for push emails).