diff options
author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-25 16:28:42 -0600 |
---|---|---|
committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-25 16:28:42 -0600 |
commit | 1444edfcefcf88039524198574861f2bcae9617c (patch) | |
tree | 608914d03545958b584c325ab1e19b88033a56c0 /configure.in | |
parent | 0a7a2b8f66ab1e86410dc5456ec200d5f69042a1 (diff) | |
parent | d4bfae38ac685d1f277fcc1b42ac003f98d8c940 (diff) | |
download | mariadb-git-1444edfcefcf88039524198574861f2bcae9617c.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into siva.hindu.god:/usr/home/tim/m/bk/50
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 3ef871016d1..76c60e1c201 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.27) +AM_INIT_AUTOMAKE(mysql, 5.0.29) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=27 +NDB_VERSION_BUILD=29 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? |