List:Commits« Previous MessageNext Message »
From:tomas Date:July 25 2007 7:26am
Subject:bk commit into 5.1 tree (tomas:1.2589)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-25 07:26:05+02:00, tomas@stripped +2 -0
  revert previos backwards compat change, made NDB_MAKE_VERSION available in drop6pX
instead

  storage/ndb/include/ndb_version.h.in@stripped, 2007-07-25 07:26:02+02:00,
tomas@stripped +0 -2
    revert previos backwards compat change, made NDB_MAKE_VERSION available in drop6pX
instead

  storage/ndb/include/util/version.h@stripped, 2007-07-25 07:26:02+02:00,
tomas@stripped +1 -0
    revert previos backwards compat change, made NDB_MAKE_VERSION available in drop6pX
instead

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.2

--- 1.20/storage/ndb/include/ndb_version.h.in	2007-07-23 08:18:36 +02:00
+++ 1.21/storage/ndb/include/ndb_version.h.in	2007-07-25 07:26:02 +02:00
@@ -24,8 +24,6 @@
 
 /* NDB status version */
 #define NDB_VERSION_STATUS "@NDB_VERSION_STATUS@"
-/* some backwards compatible macros */
-#define MAKE_VERSION(A,B,C) NDB_MAKE_VERSION(A,B,C)
 
 #define NDB_MYSQL_VERSION_MAJOR @NDB_MYSQL_VERSION_MAJOR@
 #define NDB_MYSQL_VERSION_MINOR @NDB_MYSQL_VERSION_MINOR@

--- 1.9/storage/ndb/include/util/version.h	2007-07-23 08:18:36 +02:00
+++ 1.10/storage/ndb/include/util/version.h	2007-07-25 07:26:02 +02:00
@@ -19,6 +19,7 @@
 #include <ndb_version.h>
 
 /* some backwards compatible macros */
+#define MAKE_VERSION(A,B,C) NDB_MAKE_VERSION(A,B,C)
 #define getMajor(a) ndbGetMajor(a)
 #define getMinor(a) ndbGetMinor(a)
 #define getBuild(a) ndbGetBuild(a)
Thread
• bk commit into 5.1 tree (tomas:1.2589)tomas25 Jul