bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4121)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4121 Magnus Blåudd	2011-01-21
      ndb
       - move the defines of old names for "ndb_apply_status" and "ndb_schema"
        to the only place where they are used in ndb_restore(Restore.cpp)

    modified:
      sql/ha_ndbcluster_tables.h
      storage/ndb/tools/restore/Restore.cpp
=== modified file 'sql/ha_ndbcluster_tables.h'
--- a/sql/ha_ndbcluster_tables.h	2009-05-27 12:11:46 +0000
+++ b/sql/ha_ndbcluster_tables.h	2011-01-21 08:38:59 +0000
@@ -17,12 +17,9 @@
 */
 
 #define NDB_REP_DB      "mysql"
-#define OLD_NDB_REP_DB  "cluster"
 #define NDB_REP_TABLE   "ndb_binlog_index"
 #define NDB_APPLY_TABLE "ndb_apply_status"
-#define OLD_NDB_APPLY_TABLE "apply_status"
 #define NDB_SCHEMA_TABLE "ndb_schema"
-#define OLD_NDB_SCHEMA_TABLE "schema"
 #define NDB_REPLICATION_TABLE "ndb_replication"
 
 enum Ndb_binlog_type

=== modified file 'storage/ndb/tools/restore/Restore.cpp'
--- a/storage/ndb/tools/restore/Restore.cpp	2010-12-03 09:36:45 +0000
+++ b/storage/ndb/tools/restore/Restore.cpp	2011-01-21 08:38:59 +0000
@@ -507,6 +507,10 @@ end:
   return true;
 }
 
+#define OLD_NDB_REP_DB  "cluster"
+#define OLD_NDB_APPLY_TABLE "apply_status"
+#define OLD_NDB_SCHEMA_TABLE "schema"
+
 bool
 RestoreMetaData::markSysTables()
 {

Attachment: [text/bzr-bundle] bzr/[e-mail]