diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-03-02 09:17:17 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-03-02 09:17:17 +0700 |
| commit | 6b2e1485666b68fc6e81d22b0e988ab5337541bf (patch) | |
| tree | ec3e0c81709951af26d5e86eafd5bb9e5b3440b4 /storage/ndb/include/kernel | |
| parent | 9a68e4074ffe7a75a1be8c3ba33ae88725cfb207 (diff) | |
| parent | af0554d133a412637d93160d1c8a6a183db793be (diff) | |
| download | mariadb-git-6b2e1485666b68fc6e81d22b0e988ab5337541bf.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Diffstat (limited to 'storage/ndb/include/kernel')
5 files changed, 8 insertions, 3 deletions
diff --git a/storage/ndb/include/kernel/signaldata/AlterTable.hpp b/storage/ndb/include/kernel/signaldata/AlterTable.hpp index 6469e673370..3d348f8582a 100644 --- a/storage/ndb/include/kernel/signaldata/AlterTable.hpp +++ b/storage/ndb/include/kernel/signaldata/AlterTable.hpp @@ -212,7 +212,8 @@ public: NullablePrimaryKey = 740, UnsupportedChange = 741, BackupInProgress = 762, - IncompatibleVersions = 763 + IncompatibleVersions = 763, + SingleUser = 299 }; private: diff --git a/storage/ndb/include/kernel/signaldata/CreateIndx.hpp b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp index 58a5c2ced93..74f1237c383 100644 --- a/storage/ndb/include/kernel/signaldata/CreateIndx.hpp +++ b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp @@ -208,6 +208,7 @@ public: AllocationError = 4252, CreateIndexTableFailed = 4253, DuplicateAttributes = 4258, + SingleUser = 299, TableIsTemporary = 776, TableIsNotTemporary = 777, NoLoggingTemporaryIndex = 778 diff --git a/storage/ndb/include/kernel/signaldata/CreateTable.hpp b/storage/ndb/include/kernel/signaldata/CreateTable.hpp index 4257c0b20eb..6ee304fcad8 100644 --- a/storage/ndb/include/kernel/signaldata/CreateTable.hpp +++ b/storage/ndb/include/kernel/signaldata/CreateTable.hpp @@ -92,6 +92,7 @@ public: InvalidPrimaryKeySize = 739, NullablePrimaryKey = 740, InvalidCharset = 743, + SingleUser = 299, InvalidTablespace = 755, VarsizeBitfieldNotSupported = 757, NotATablespace = 758, diff --git a/storage/ndb/include/kernel/signaldata/DropIndx.hpp b/storage/ndb/include/kernel/signaldata/DropIndx.hpp index 01d500f2d84..6e3b183995f 100644 --- a/storage/ndb/include/kernel/signaldata/DropIndx.hpp +++ b/storage/ndb/include/kernel/signaldata/DropIndx.hpp @@ -172,7 +172,8 @@ public: IndexNotFound = 4243, BadRequestType = 4247, InvalidName = 4248, - NotAnIndex = 4254 + NotAnIndex = 4254, + SingleUser = 299 }; STATIC_CONST( SignalLength = DropIndxConf::SignalLength + 3 ); diff --git a/storage/ndb/include/kernel/signaldata/DropTable.hpp b/storage/ndb/include/kernel/signaldata/DropTable.hpp index 36268b23be1..c0a4596e1dc 100644 --- a/storage/ndb/include/kernel/signaldata/DropTable.hpp +++ b/storage/ndb/include/kernel/signaldata/DropTable.hpp @@ -58,7 +58,8 @@ public: InvalidTableVersion = 241, DropInProgress = 283, NoDropTableRecordAvailable = 1229, - BackupInProgress = 761 + BackupInProgress = 761, + SingleUser = 299 }; }; |