summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <tsmith@siva.hindu.god>2007-04-17 15:40:13 -0600
committerunknown <tsmith@siva.hindu.god>2007-04-17 15:40:13 -0600
commit633c1a65157e816ed3690c8faa6a66522a1ad0de (patch)
tree234a737d6eaeed86d4eb5078a30f7a82ccee75ba /configure.in
parent59250a68e2bf4fecb07516df9df67a517664d085 (diff)
parent46e37afd0661630c442a61d9b23766b4ac802381 (diff)
downloadmariadb-git-633c1a65157e816ed3690c8faa6a66522a1ad0de.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index d42da033f3d..d95b7eea0c6 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.40)
+AM_INIT_AUTOMAKE(mysql, 5.0.42)
AM_CONFIG_HEADER(config.h)
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=40
+NDB_VERSION_BUILD=42
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?