diff options
| author | unknown <joreland@mysql.com> | 2005-07-20 13:32:20 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-07-20 13:32:20 +0200 |
| commit | 5aac38c084590e894f2e82b4cdef349dcc14e3f1 (patch) | |
| tree | 644d38ed99a68975522f89bcec3ef3e32201f79f /ndb/include | |
| parent | a3a9d00b3b16fab0ca2f9cfa2a297b2abdcef4c3 (diff) | |
| parent | fe07364726d1f41c15b915292bfb87fe9fee312d (diff) | |
| download | mariadb-git-5aac38c084590e894f2e82b4cdef349dcc14e3f1.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/signaldata/AlterTable.hpp | 3 | ||||
| -rw-r--r-- | ndb/include/kernel/signaldata/DictTabInfo.hpp | 1 | ||||
| -rw-r--r-- | ndb/include/kernel/signaldata/DropTable.hpp | 3 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbDictionary.hpp | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/ndb/include/kernel/signaldata/AlterTable.hpp b/ndb/include/kernel/signaldata/AlterTable.hpp index 30f8727551d..173a9acf9ed 100644 --- a/ndb/include/kernel/signaldata/AlterTable.hpp +++ b/ndb/include/kernel/signaldata/AlterTable.hpp @@ -128,7 +128,8 @@ public: RecordTooBig = 738, InvalidPrimaryKeySize = 739, NullablePrimaryKey = 740, - UnsupportedChange = 741 + UnsupportedChange = 741, + BackupInProgress = 762 }; private: diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/ndb/include/kernel/signaldata/DictTabInfo.hpp index a2f9fcc9799..48c24125ae4 100644 --- a/ndb/include/kernel/signaldata/DictTabInfo.hpp +++ b/ndb/include/kernel/signaldata/DictTabInfo.hpp @@ -209,6 +209,7 @@ public: StateBuilding = 2, StateDropping = 3, StateOnline = 4, + StateBackup = 5, StateBroken = 9 }; diff --git a/ndb/include/kernel/signaldata/DropTable.hpp b/ndb/include/kernel/signaldata/DropTable.hpp index 7a5b96e4cd1..cae6aff8754 100644 --- a/ndb/include/kernel/signaldata/DropTable.hpp +++ b/ndb/include/kernel/signaldata/DropTable.hpp @@ -57,7 +57,8 @@ public: NoSuchTable = 709, InvalidTableVersion = 241, DropInProgress = 283, - NoDropTableRecordAvailable = 1229 + NoDropTableRecordAvailable = 1229, + BackupInProgress = 761 }; }; diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/ndb/include/ndbapi/NdbDictionary.hpp index 0e4f506c604..85615f3aa66 100644 --- a/ndb/include/ndbapi/NdbDictionary.hpp +++ b/ndb/include/ndbapi/NdbDictionary.hpp @@ -118,6 +118,7 @@ public: StateBuilding = 2, ///< Building, not yet usable StateDropping = 3, ///< Offlining or dropping, not usable StateOnline = 4, ///< Online, usable + StateBackup = 5, ///< Online, being backuped, usable StateBroken = 9 ///< Broken, should be dropped and re-created }; |