summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2005-12-09 13:51:12 +0100
committerunknown <jonas@perch.ndb.mysql.com>2005-12-09 13:51:12 +0100
commit5b10b7bc535241fa48370be6bd2008fc21efa323 (patch)
tree248bd78661d1ee74b2fb6a848f1ffa302bc030c8 /ndb/include
parentfc4c198ef01f401bf9d88171ef794dd4868cefd5 (diff)
downloadmariadb-git-5b10b7bc535241fa48370be6bd2008fc21efa323.tar.gz
bug#15632 - ndb
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/include/ndb_version.h.in: Handle upgrade of bug fix ndb/src/kernel/blocks/ERROR_codes.txt: New error code for delaying INCL_NODE_REQ ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug#15632
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/ndb_version.h.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/ndb/include/ndb_version.h.in b/ndb/include/ndb_version.h.in
index 826f5124407..38b72306d03 100644
--- a/ndb/include/ndb_version.h.in
+++ b/ndb/include/ndb_version.h.in
@@ -57,5 +57,8 @@ char ndb_version_string_buf[NDB_VERSION_STRING_BUF_SZ];
*/
/*#define NDB_VERSION_ID 0*/
+#define NDBD_INCL_NODECONF_VERSION_4 MAKE_VERSION(4,1,17)
+#define NDBD_INCL_NODECONF_VERSION_5 MAKE_VERSION(5,0,18)
+
#endif