bzr commit into mysql-5.1-telco-6.2 branch (frazer:3041) Bug#47289

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.2/

 3041 Frazer Clement	2009-12-02
      Bug#47289 ndb_restore can crash if a hidden blob table is missing
      modified:
        storage/ndb/tools/restore/Restore.cpp

=== modified file 'storage/ndb/tools/restore/Restore.cpp'
--- a/storage/ndb/tools/restore/Restore.cpp	2009-12-01 08:56:39 +0000
+++ b/storage/ndb/tools/restore/Restore.cpp	2009-12-02 14:50:34 +0000
@@ -416,7 +416,16 @@ RestoreMetaData::fixBlobs()
           break;
         }
       }
-      assert(blobTable != NULL);
+      if (blobTable == NULL)
+      {
+        /* Corrupt backup, has main table, but no blob table */
+        err << "Table " << table->m_dictTable->getName()
+            << " has blob column " << j << " (" 
+            << c->m_name.c_str()
+            << ") with missing parts table in backup."
+            << endl;
+        return false;
+      }
       assert(blobTable->m_dictTable != NULL);
       NdbTableImpl& bt = NdbTableImpl::getImpl(*blobTable->m_dictTable);
       const char* colName = c->m_blobVersion == 1 ? "DATA" : "NDB$DATA";