Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/log_event.cc:
  manual merge

1 files changed, 3 insertions, 3 deletions

diff --git a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
index ec2550118d3..c12dc4dd0e8 100644
--- a/storage/ndb/tools/restore/restore_main.cpp
+++ b/storage/ndb/tools/restore/restore_main.cpp
@@ -684,7 +684,7 @@ main(int argc, char** argv)
   char buf[NDB_VERSION_STRING_BUF_SZ];
   info.setLevel(254);
   info << "Ndb version in backup files: " 
-       <<  getVersionString(version, 0, buf, sizeof(buf)) << endl;
+       <<  ndbGetVersionString(version, 0, buf, sizeof(buf)) << endl;
   
   /**
    * check wheater we can restore the backup (right version).
@@ -694,9 +694,9 @@ main(int argc, char** argv)
   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))
+        << ndbGetVersionString(MAKE_VERSION(5,1,3), 0, buf, sizeof(buf))
         << " and "
-        << getVersionString(MAKE_VERSION(5,1,9), 0, buf, sizeof(buf))
+        << ndbGetVersionString(MAKE_VERSION(5,1,9), 0, buf, sizeof(buf))
         << endl;
     exitHandler(NDBT_FAILED);
   }