From c36637a96e2722dfa6ad789b2fb2985d64b1a48a Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Tue, 5 Oct 2004 06:49:11 +0000 Subject: [PATCH] bumped up version to 3.5.2 removed staus flag --- configure.in | 4 ++-- ndb/src/common/util/version.c | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 39151205533..97ecb90177d 100644 --- a/configure.in +++ b/configure.in @@ -15,8 +15,8 @@ SHARED_LIB_VERSION=14:0:0 # ndb version NDB_VERSION_MAJOR=3 NDB_VERSION_MINOR=5 -NDB_VERSION_BUILD=1 -NDB_VERSION_STATUS=beta +NDB_VERSION_BUILD=2 +NDB_VERSION_STATUS=0 # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c index 937ca1d32dd..ae699beca14 100644 --- a/ndb/src/common/util/version.c +++ b/ndb/src/common/util/version.c @@ -37,13 +37,19 @@ Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) { char * getVersionString(Uint32 version, char * status) { char buff[100]; - snprintf(buff, sizeof(buff), - "Version %d.%d.%d (%s)", - getMajor(version), - getMinor(version), - getBuild(version), - status); - + if (status) + snprintf(buff, sizeof(buff), + "Version %d.%d.%d (%s)", + getMajor(version), + getMinor(version), + getBuild(version), + status); + else + snprintf(buff, sizeof(buff), + "Version %d.%d.%d", + getMajor(version), + getMinor(version), + getBuild(version)); return strdup(buff); } @@ -63,6 +69,7 @@ struct NdbUpGradeCompatible { #ifndef TEST_VERSION struct NdbUpGradeCompatible ndbCompatibleTable_full[] = { + { MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact }, { 0, 0, UG_Null } };