summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-12-11 23:18:14 +0100
committerunknown <istruewing@stella.local>2007-12-11 23:18:14 +0100
commit6f568e0a9971e3f53a52f2007c38c6c349ba3f62 (patch)
tree153ebb1642037375cb6f728adb6f75c0f77c28a3
parentcd34354e6c8d86d19fb397912d98803254bebaaf (diff)
parentb56d3824a470400b3b1b8c2e4ef49cff8bfabd5c (diff)
downloadmariadb-git-6f568e0a9971e3f53a52f2007c38c6c349ba3f62.tar.gz
Merge stella.local:/home2/mydev/mysql-5.0-amain
into stella.local:/home2/mydev/mysql-5.0-axmrg
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 52fe0dc9c66..ead2f85afb7 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.52)
+AM_INIT_AUTOMAKE(mysql, 5.0.54)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=52
+NDB_VERSION_BUILD=54
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?