summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2010-01-12 12:12:42 +0100
committerJoerg Bruehe <joerg@mysql.com>2010-01-12 12:12:42 +0100
commitedf7f3350f732b017f0b45e404e35a3b5b53d19e (patch)
tree3c0c10a7b9a4b467faa24eda780dbef3464d2871 /configure.in
parent107f34ed77aad27b1fca24aaf048d1cbb28978b2 (diff)
parent91aa5e248ed2897a7cad0e3060ce1689fee6a5b2 (diff)
downloadmariadb-git-edf7f3350f732b017f0b45e404e35a3b5b53d19e.tar.gz
Merge from main tree,
but don't take the "tree name" change.
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 e14b4014bea..b206dfbd079 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.89)
+AM_INIT_AUTOMAKE(mysql, 5.0.90)
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=89
+NDB_VERSION_BUILD=90
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?