diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-02-16 18:16:22 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-02-16 18:16:22 +0100 |
| commit | 24a20fbe919541c982bb220188a7d5c17382f905 (patch) | |
| tree | 47bbc1ed6baf89d9c5764c0b55ced4a99dbf39df /storage | |
| parent | 5eff43c35bef033f2a79f0513c075dd1a85514d8 (diff) | |
| parent | 574e71e276c6a7ca3ab8540cd27a9c25c3625e2a (diff) | |
| download | mariadb-git-24a20fbe919541c982bb220188a7d5c17382f905.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
Diffstat (limited to 'storage')
| -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 595e228a5b0..8fc9e870b80 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 }, |