diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-02-14 11:55:31 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-02-14 11:55:31 +0700 |
| commit | af4c24bbc7836e26ffe012104b972b41f6ed4e1f (patch) | |
| tree | 1017dbcabeb31f553739726ae26c39a955789e3f /storage/ndb/include/kernel/signaldata | |
| parent | 414f5868d5ede014dccdeb8e831d9fc4d40c1ac0 (diff) | |
| parent | 9467918098a8cf798f3ececc50462f60e9e7579c (diff) | |
| download | mariadb-git-af4c24bbc7836e26ffe012104b972b41f6ed4e1f.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
manual merge
Diffstat (limited to 'storage/ndb/include/kernel/signaldata')
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp index 27bb9af03c0..46c5ef3751b 100644 --- a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp +++ b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp @@ -107,7 +107,10 @@ public: CmvmiDumpLongSignalMemory = 2601, CmvmiSetRestartOnErrorInsert = 2602, CmvmiTestLongSigWithDelay = 2603, - + CmvmiDumpSubscriptions = 2604, /* note: done to respective outfile + to be able to debug if events + for some reason does not end up + in clusterlog */ LCPContinue = 5900, // 7000 DIH // 7001 DIH |