Commit f2319493 authored by unknown's avatar unknown
Browse files

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.
parent cff44050

configure.in

+1 −7
Original line number Diff line number Diff line
@@ -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]]*-.*$||"`