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

into  mysql.com:/home/mydev/mysql-5.0-bug10932


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
This commit is contained in:
unknown 2005-12-07 19:47:55 +01:00
commit e2bf3b211b
52 changed files with 4706 additions and 1264 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.17)
AM_INIT_AUTOMAKE(mysql, 5.0.18)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10