Commit 60ce9b7c authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge

parents c59e5f82 41849b9c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.6-alpha)
AM_INIT_AUTOMAKE(mysql, 5.1.6-beta)
AM_CONFIG_HEADER(config.h)

PROTOCOL_VERSION=10