summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-07-20 11:48:48 +0200
committerunknown <joreland@mysql.com>2005-07-20 11:48:48 +0200
commit783dbfc3a8151a5fc25d8d8001e4b99575bbb24d (patch)
treea30a3b5ee7c3a753c8fdc2bacc1fc0e0fc8a16a5 /ndb/include
parent6913d8058e0eee498c1dfaf9372c7441c05b665a (diff)
downloadmariadb-git-783dbfc3a8151a5fc25d8d8001e4b99575bbb24d.tar.gz
bug#11942
ndb/include/kernel/signaldata/AlterTable.hpp: Add error code for backup in progress ndb/include/kernel/signaldata/DictTabInfo.hpp: Add backup state ndb/include/kernel/signaldata/DropTable.hpp: Add error code for backup in progress ndb/include/ndbapi/NdbDictionary.hpp: Add backup state ndb/src/kernel/blocks/backup/Backup.cpp: 1) remove invalid require (util_sequence_ref) crash 2) Don't backup objects dropping/creating 3) set correct error code on backup fragment ref (crash) 4) save TrigAttrInfo header when getting log full (crash) 5) lock/unlock tables during backup ndb/src/kernel/blocks/dbdict/Dbdict.cpp: 1) add mutex lock/unlock as part of drop/alter table 2) add lock/unlock for backup 3) remove TC from backup trigger loop ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Add BACKUP_ONGOING state ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add backup state ndb/src/ndbapi/ndberror.c: Add error code for backup in progress ndb/test/ndbapi/testBackup.cpp: Add testcase for testBackup -n BackupDDL ndb/tools/drop_index.cpp: Fix ndb_drop_index ndb/tools/listTables.cpp: Print of backup state
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/kernel/signaldata/AlterTable.hpp3
-rw-r--r--ndb/include/kernel/signaldata/DictTabInfo.hpp1
-rw-r--r--ndb/include/kernel/signaldata/DropTable.hpp3
-rw-r--r--ndb/include/ndbapi/NdbDictionary.hpp1
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..71133d43798 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 = 746
};
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..19700120788 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 = 745
};
};
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
};