Commit a79e08a6 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

parents 49383e87 6f17f42c
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 update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.1.17-beta)
AM_INIT_AUTOMAKE(mysql, 5.1.18-beta)
AM_CONFIG_HEADER(config.h)

PROTOCOL_VERSION=10