diff options
| author | unknown <msvensson@shellback.(none)> | 2006-11-29 07:55:22 +0100 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-11-29 07:55:22 +0100 |
| commit | 0c676d7a0d1bd25cbb4919f9d34974f8dcb4b481 (patch) | |
| tree | c6955174437247ab0beda528d654cac0f3fa83ab /configure.in | |
| parent | 0c2802783887f5cb91a394c6f07a121f04603364 (diff) | |
| parent | 3aca00e1059a6eae27b4525d8a2f8590e99031cb (diff) | |
| download | mariadb-git-0c676d7a0d1bd25cbb4919f9d34974f8dcb4b481.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 9c2b530a0ca..f5f2633ff2d 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.13-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.14-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -15,7 +15,6 @@ DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. SHARED_LIB_MAJOR_VERSION=15 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 - # 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]]*-.*$||"` |