summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-01-09 17:26:17 +0100
committerunknown <joerg@mysql.com>2006-01-09 17:26:17 +0100
commitf2319493c4c9a8312301785ddd8a2fc9a699fd26 (patch)
tree1bfdebac32b94db3fbac87c84c3abc046c5d021f /configure.in
parentcff44050dce44e20e03cdac51319f7446f960a13 (diff)
downloadmariadb-git-f2319493c4c9a8312301785ddd8a2fc9a699fd26.tar.gz
Version number increase.
configure.in: 1) Update version, now that 5.1.5 has been cloned. 2) Get rid of erroneous merge, NDB version is deduced automatically from global version.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in8
1 files changed, 1 insertions, 7 deletions
diff --git a/configure.in b/configure.in
index 9e2a0748b0d..e8256a5a526 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.1.5-alpha)
+AM_INIT_AUTOMAKE(mysql, 5.1.6-alpha)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
@@ -15,12 +15,6 @@ DOT_FRM_VERSION=6
# See the libtool docs for information on how to do shared lib versions.
SHARED_LIB_VERSION=15:0:0
-# ndb version
-NDB_VERSION_MAJOR=5
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=19
-NDB_VERSION_STATUS=""
-
# 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
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`