diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-02-16 18:14:41 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-02-16 18:14:41 +0100 |
| commit | 574e71e276c6a7ca3ab8540cd27a9c25c3625e2a (patch) | |
| tree | 6f946f147c419a83eba6713f3907d9b41d366e26 /storage/ndb | |
| parent | 746f990da16bfff00fd86587163b15c20bb478e6 (diff) | |
| parent | 2cd7831fb5d630da7451ba61f76b10c6a60c1500 (diff) | |
| download | mariadb-git-574e71e276c6a7ca3ab8540cd27a9c25c3625e2a.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp index 8ad231479f1..cbf7d9f5c08 100644 --- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp +++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp @@ -75,8 +75,8 @@ static BlockInfo ALL_BLOCKS[] = { { DBTUP_REF, 1 , 4000, 4007 }, { DBDICT_REF, 1 , 6000, 6003 }, { NDBCNTR_REF, 0 , 1000, 1999 }, + { CMVMI_REF, 1 , 9000, 9999 }, // before QMGR { QMGR_REF, 1 , 1, 999 }, - { CMVMI_REF, 1 , 9000, 9999 }, { TRIX_REF, 1 , 0, 0 }, { BACKUP_REF, 1 , 10000, 10999 }, { DBUTIL_REF, 1 , 11000, 11999 }, |