bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:5047 to 5048)

[Jonas Oreland]

 5048 Jonas Oreland	2012-12-05
      fixes - commit for autotest - attempt 4

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
 5047 Jonas Oreland	2012-12-03
      fixes - commit for autotest - attempt 3

    modified:
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2012-12-03 15:29:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2012-12-05 13:33:36 +0000
@@ -6255,7 +6255,7 @@ Dbdih::invalidateNodeLCP(Signal* signal,
     jam();    
     signal->theData[0] = DihContinueB::ZINVALIDATE_NODE_LCP;
     signal->theData[1] = nodeId;
-    signal->theData[2] = tabPtr.i;
+    signal->theData[2] = tabPtr.p->m_tableId;
     sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 20, 3);
     return;
   }//if  
@@ -6381,7 +6381,7 @@ void Dbdih::removeNodeFromTable(Signal*
     jam();    
     signal->theData[0] = DihContinueB::ZREMOVE_NODE_FROM_TABLE;
     signal->theData[1] = nodeId;
-    signal->theData[2] = tabPtr.i;
+    signal->theData[2] = tabPtr.p->m_tableId;
     sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 20, 3);
     return;
   }//if  
@@ -14051,9 +14051,10 @@ Dbdih::reportLcpCompletion(const LcpFrag
   Uint32 nodeId = lcpReport->nodeId;
 
   TabRecordPtr tabPtr;
-  ndbrequire(getTable(tabPtr, tableId));
+  bool ok = getTable(tabPtr, tableId);
 
-  if (tabPtr.p->tabStatus == TabRecord::TS_DROPPING ||
+  if (ok == false ||
+      tabPtr.p->tabStatus == TabRecord::TS_DROPPING ||
       tabPtr.p->tabStatus == TabRecord::TS_IDLE)
   {
     jam();

=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2012-11-29 14:04:03 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2012-12-05 13:33:36 +0000
@@ -944,6 +944,8 @@ runCreateMaxTables(NDBT_Context* ctx, ND
 {
   char tabName[256];
   int numTables = ctx->getProperty("tables", 1000);
+  bool logging = ctx->getProperty("NOLOGGING", Uint32(0)) ? 0 : 1;
+
   Ndb* pNdb = GETNDB(step);
   NdbDictionary::Dictionary* pDic = pNdb->getDictionary();
   int i = 0;
@@ -958,6 +960,7 @@ runCreateMaxTables(NDBT_Context* ctx, ND
     // Set new name for T1
     NdbDictionary::Table newTab(* pTab);
     newTab.setName(tabName);
+    newTab.setLogging(logging);
     // Drop any old (or try to)
     (void)pDic->dropTable(newTab.getName());
     // Try to create table in db
@@ -9762,6 +9765,7 @@ TESTCASE("TemporaryTables",
 TESTCASE("CreateMaxTables", 
 	 "Create tables until db says that it can't create any more\n"){
   TC_PROPERTY("tables", 1000);
+  TC_PROPERTY("NOLOGGING", 1);
   INITIALIZER(runCreateMaxTables);
   INITIALIZER(runDropMaxTables);
 }

No bundle (reason: useless for push emails).