diff options
| author | unknown <mskold/marty@linux.site> | 2006-12-01 16:37:13 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-12-01 16:37:13 +0100 |
| commit | 08f598a14471f1da4cb83f440e43fbb4a51103d6 (patch) | |
| tree | b3da51e8f4d220ecc2a7dd80a5a49c30dbc20d74 /storage | |
| parent | 10a497a623f9b5b7176e9edad8b077597471e284 (diff) | |
| parent | 85b58cb43bf3170d817864e2a019779c20320245 (diff) | |
| download | mariadb-git-08f598a14471f1da4cb83f440e43fbb4a51103d6.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/tools/restore/Restore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp index b51760266cb..ebda5fc9622 100644 --- a/storage/ndb/tools/restore/Restore.cpp +++ b/storage/ndb/tools/restore/Restore.cpp @@ -305,8 +305,8 @@ RestoreMetaData::markSysTables() before we changed the database name of the tables from "cluster_replication" -> "cluster" -> "mysql" */ - strcmp(tableName, "cluster_replication/def/" NDB_APPLY_TABLE) == 0 || - strcmp(tableName, "cluster/def/" NDB_APPLY_TABLE) == 0 || + strcmp(tableName, "cluster_replication/def/" OLD_NDB_APPLY_TABLE) == 0 || + strcmp(tableName, "cluster/def/" OLD_NDB_APPLY_TABLE) == 0 || strcmp(tableName, NDB_REP_DB "/def/" NDB_APPLY_TABLE) == 0 || strcmp(tableName, NDB_REP_DB "/def/" NDB_SCHEMA_TABLE)== 0 ) table->isSysTable = true; |