bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3724 to 3725)

[Magnus Blåudd]

 3725 Magnus Blåudd	2010-08-05 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/include/ndb_version.h.in
      storage/ndb/ndb_configure.m4
 3724 Magnus Blåudd	2010-08-04
      ndb
       - Make the SET_JAVA_NDB_VERSION macro run everytime
       - Fix cmake syntax error

    modified:
      storage/ndb/config/type_JAVA.cmake
=== modified file 'storage/ndb/include/ndb_version.h.in'
--- a/storage/ndb/include/ndb_version.h.in	2010-08-04 14:00:24 +0000
+++ b/storage/ndb/include/ndb_version.h.in	2010-08-05 08:12:31 +0000
@@ -22,22 +22,38 @@
 #include <ndb_types.h>
 #include <mysql_version.h>
 
-/* NDB version numbers and status */
+/*
+  Creates a composite version number from major, minor and build
+  ex: NDB_MAKE_VERSION(5,1,47) => 0x00050147
+*/
+#define NDB_MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))
+
+/* NDB version numbers and status  */
 #define NDB_VERSION_MAJOR @NDB_VERSION_MAJOR@
 #define NDB_VERSION_MINOR @NDB_VERSION_MINOR@
 #define NDB_VERSION_BUILD @NDB_VERSION_BUILD@
 #define NDB_VERSION_STATUS "@NDB_VERSION_STATUS@"
 
-/* MySQL Server version numbers extracted from MYSQL_VERSION_ID */
+/* Composite version number for NDB */
+#define NDB_VERSION_D \
+  NDB_MAKE_VERSION(NDB_VERSION_MAJOR, NDB_VERSION_MINOR, NDB_VERSION_BUILD)
+
+/*
+  The version number of the MySQL Server that NDB is built
+  with. Extracted from MYSQL_VERSION_ID
+*/
 #define NDB_MYSQL_VERSION_MAJOR ((MYSQL_VERSION_ID / 10000) % 100)
 #define NDB_MYSQL_VERSION_MINOR ((MYSQL_VERSION_ID /100) % 100)
 #define NDB_MYSQL_VERSION_BUILD (MYSQL_VERSION_ID % 100)
 
-#define NDB_MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))
+/* Composite version number for MYSQL Server */
+#define NDB_MYSQL_VERSION_D \
+  NDB_MAKE_VERSION(NDB_MYSQL_VERSION_MAJOR, \
+                   NDB_MYSQL_VERSION_MINOR, \
+                   NDB_MYSQL_VERSION_BUILD)
 
-#define NDB_MYSQL_VERSION_D NDB_MAKE_VERSION(NDB_MYSQL_VERSION_MAJOR, NDB_MYSQL_VERSION_MINOR, NDB_MYSQL_VERSION_BUILD)
-#define NDB_VERSION_D NDB_MAKE_VERSION(NDB_VERSION_MAJOR, NDB_VERSION_MINOR, NDB_VERSION_BUILD)
 #define NDB_VERSION_STRING_BUF_SZ 100
+
 #ifdef __cplusplus
 extern "C" {
 #endif

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2010-08-04 14:15:14 +0000
+++ b/storage/ndb/ndb_configure.m4	2010-08-05 08:14:08 +0000
@@ -1,4 +1,5 @@
-# The version number of NDB
+# The NDB version number and status.
+# Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=6

Attachment: [text/bzr-bundle] bzr/[e-mail]