bk commit into 5.1 tree (tomas:1.2353)

[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.2353 06/04/25 17:02:46 tomas@stripped +1 -0
  ndb_restore: more compatablitity checks

  storage/ndb/tools/restore/restore_main.cpp
    1.44 06/04/25 17:02:39 tomas@stripped +20 -1
    ndb_restore: more compatablitity checks

# 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.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.43/storage/ndb/tools/restore/restore_main.cpp	2006-04-21 01:39:27 +02:00
+++ 1.44/storage/ndb/tools/restore/restore_main.cpp	2006-04-25 17:02:39 +02:00
@@ -483,10 +483,29 @@
   char buf[NDB_VERSION_STRING_BUF_SZ];
   info << "Ndb version in backup files: " 
 	 <<  getVersionString(version, 0, buf, sizeof(buf)) << endl;
-  
+
   /**
    * check wheater we can restore the backup (right version).
    */
+  // in these versions there was an error in how replica info was
+  // stored on disk
+  if (version >= MAKE_VERSION(5,1,3) && version <= MAKE_VERSION(5,1,9))
+  {
+    err << "Restore program incompatible with backup versions between "
+        << getVersionString(MAKE_VERSION(5,1,3), 0, buf, sizeof(buf))
+        << " and "
+        << getVersionString(MAKE_VERSION(5,1,9), 0, buf, sizeof(buf))
+        << endl;
+    exitHandler(NDBT_FAILED);
+  }
+
+  if (version > NDB_VERSION)
+  {
+    err << "Restore program older than backup version. Not supported. "
+        << "Use new restore program"
+    exitHandler(NDBT_FAILED);
+  }
+
   debug << "Load content" << endl;
   int res  = metaData.loadContent();