diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2007-03-27 14:33:18 +0200 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2007-03-27 14:33:18 +0200 |
commit | b34ed3a15d06671bcc811f31e2ec8edecb75b291 (patch) | |
tree | 78d6ba34a6f0bf8b384d77624ee009494c070617 /storage/ndb/include/kernel/signaldata | |
parent | 2dab4457838aaf36629b0e292c13171f4beb753a (diff) | |
parent | 6da1cec05255cf0fff6f08c79f7c9ceecec1ae2c (diff) | |
download | mariadb-git-b34ed3a15d06671bcc811f31e2ec8edecb75b291.tar.gz |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
Diffstat (limited to 'storage/ndb/include/kernel/signaldata')
-rw-r--r-- | storage/ndb/include/kernel/signaldata/StartPerm.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/ndb/include/kernel/signaldata/StartPerm.hpp b/storage/ndb/include/kernel/signaldata/StartPerm.hpp index ffb16bfec9d..16229f6552f 100644 --- a/storage/ndb/include/kernel/signaldata/StartPerm.hpp +++ b/storage/ndb/include/kernel/signaldata/StartPerm.hpp @@ -67,6 +67,7 @@ private: enum ErrorCode { ZNODE_ALREADY_STARTING_ERROR = 305, + ZNODE_START_DISALLOWED_ERROR = 309, InitialStartRequired = 320 }; }; |