Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0


configure.in:
  Auto merged
This commit is contained in:
unknown 2007-06-19 12:10:48 +02:00
commit 8f24e8222c

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.44)
AM_INIT_AUTOMAKE(mysql, 5.0.46)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=44
NDB_VERSION_BUILD=46
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?