bk commit into 5.1 tree (jonas:1.2134) BUG#16873

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.2134 06/02/06 10:07:15 jonas@stripped +1 -0
  bug#16873 - 
    Print creating of dd objects during ndb_restore

  storage/ndb/tools/restore/consumer_restore.cpp
    1.27 06/02/06 10:07:12 jonas@stripped +12 -10
    Print creating of dd objects

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new

--- 1.26/storage/ndb/tools/restore/consumer_restore.cpp	2006-02-01 11:56:13 +01:00
+++ 1.27/storage/ndb/tools/restore/consumer_restore.cpp	2006-02-06 10:07:12 +01:00
@@ -453,15 +453,15 @@
     {
       NdbDictionary::LogfileGroup * lg = m_logfilegroups[old.getDefaultLogfileGroupId()];
       old.setDefaultLogfileGroup(* lg);
+      info << "Creating tablespace: " << old.getName() << "..."
<< flush;
       int ret = dict->createTablespace(old);
       if (ret)
       {
 	NdbError errobj= dict->getNdbError();
-	err << "Failed to create tablespace \"" << old.getName() << "\": "
-	    << errobj << endl;
+	info << "FAILED " << errobj << endl;
 	return false;
       }
-      debug << "Created tablespace: " << old.getName() << endl;
+      info << "done" << endl;
     }
     
     NdbDictionary::Tablespace curr = dict->getTablespace(old.getName());
@@ -491,15 +491,15 @@
     
     if (!m_no_restore_disk)
     {
+      info << "Creating logfile group: " << old.getName() << "..."
<< flush;
       int ret = dict->createLogfileGroup(old);
       if (ret)
       {
 	NdbError errobj= dict->getNdbError();
-	err << "Failed to create logfile group \"" << old.getName() << "\": "
-	    << errobj << endl;
+	info << "FAILED" << errobj << endl;
 	return false;
       }
-      debug << "Created logfile group: " << old.getName() << endl;
+      info << "done" << endl;
     }
     
     NdbDictionary::LogfileGroup curr = dict->getLogfileGroup(old.getName());
@@ -532,12 +532,13 @@
 	    << " to tablespace: oldid: " << old.getTablespaceId() 
 	    << " newid: " << ts->getObjectId() << endl;
       old.setTablespace(* ts);
+      info << "Creating datafile \"" << old.getPath() << "\"..."
<< flush;
       if (dict->createDatafile(old))
       {
-	err << "Failed to create datafile \"" << old.getPath() << "\": "
-	    << dict->getNdbError() << endl;
+	info << "FAILED " << dict->getNdbError() << endl;
 	return false;
       }
+      info << "done" << endl;
     }
     return true;
     break;
@@ -554,12 +555,13 @@
 	    << " newid: " << lg->getObjectId() 
 	    << " " << (void*)lg << endl;
       old.setLogfileGroup(* lg);
+      info << "Creating undofile \"" << old.getPath() << "\"..."
<< flush;
       if (dict->createUndofile(old))
       {
-	err << "Failed to create undofile \"" << old.getPath() << "\": "
-	    << dict->getNdbError() << endl;
+	info << "FAILED " << dict->getNdbError() << endl;
 	return false;
       }
+      info << "done" << endl;
     }
     return true;
     break;