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
This commit is contained in:
unknown 2006-10-25 16:28:42 -06:00
commit 1444edfcef
68 changed files with 2609 additions and 460 deletions

View file

@ -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 ?