From 60cad950c937da377a2629c915c8704892c73e13 Mon Sep 17 00:00:00 2001 From: MySQL Build Team Date: Fri, 22 May 2009 21:05:46 +0200 Subject: [PATCH] Bug #44536: MySQL 5.4 version mismatch in the sources Update version number; also modify NDB's version.c for compatibility. --- configure.in | 4 ++-- storage/ndb/src/common/util/version.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index a770dd5e92d..0266d43a1f4 100644 --- a/configure.in +++ b/configure.in @@ -9,8 +9,8 @@ AC_CANONICAL_SYSTEM # remember to also update version.c in ndb # # When changing major version number please also check switch statement -# in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.33-pv-0.2.2) +# in client/mysqlbinlog.cc:check_master_version(). +AM_INIT_AUTOMAKE(mysql, 5.4.1-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 diff --git a/storage/ndb/src/common/util/version.c b/storage/ndb/src/common/util/version.c index 56a92489131..b8d050ec97e 100644 --- a/storage/ndb/src/common/util/version.c +++ b/storage/ndb/src/common/util/version.c @@ -98,7 +98,7 @@ void ndbSetOwnVersion() {} #ifndef TEST_VERSION struct NdbUpGradeCompatible ndbCompatibleTable_full[] = { - { MAKE_VERSION(5,1,NDB_VERSION_BUILD), MAKE_VERSION(5,1,18), UG_Range}, + { MAKE_VERSION(5,4,NDB_VERSION_BUILD), MAKE_VERSION(5,1,18), UG_Range}, { MAKE_VERSION(5,1,17), MAKE_VERSION(5,1,0), UG_Range}, { MAKE_VERSION(5,0,NDB_VERSION_BUILD), MAKE_VERSION(5,0,12), UG_Range}, { MAKE_VERSION(5,0,11), MAKE_VERSION(5,0,2), UG_Range},