bk commit into 5.1 tree (tomas:1.2427)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2427 07/03/07 14:20:37 tomas@stripped +1 -0
  corrected manual merge

  storage/ndb/tools/restore/restore_main.cpp
    1.53 07/03/07 14:20:29 tomas@stripped +6 -4
    corrected manual merge

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-gca-ndb_restore

--- 1.52/storage/ndb/tools/restore/restore_main.cpp	2007-03-07 13:44:45 +07:00
+++ 1.53/storage/ndb/tools/restore/restore_main.cpp	2007-03-07 14:20:29 +07:00
@@ -350,6 +350,8 @@ get_one_option(int optid, const struct m
       to nodegroup in new cluster.
     */
     opt_nodegroup_map_len= 0;
+
+    info.setLevel(254);
     info << "Analyse node group map" << endl;
     if (analyse_nodegroup_map(opt_nodegroup_map_str,
                               &opt_nodegroup_map[0]))
@@ -404,8 +406,8 @@ o verify nodegroup mapping
   exit(NDBT_ProgramExit(NDBT_WRONGARGS));
 #endif
 
-  BackupPrinter* g_printer = new BackupPrinter(opt_nodegroup_map,
-                                               opt_nodegroup_map_len);
+  g_printer = new BackupPrinter(opt_nodegroup_map,
+                                opt_nodegroup_map_len);
   if (g_printer == NULL)
     return false;
 
@@ -785,10 +787,10 @@ main(int argc, char** argv)
 	} 
     } else {
       for(Uint32 j= 0; j < g_consumers.size(); j++)
-        if (!g_consumers[j]->createSystable(* metaData[i]))
+        if (!g_consumers[j]->createSystable(* table))
         {
           err << "Restore: Failed to restore system table: ";
-          err << metaData[i]->getTableName() << " ... Exiting " << endl;
+          err << table->getTableName() << " ... Exiting " << endl;
           exitHandler(NDBT_FAILED);
         }
     }