Commit cdd4722b authored Feb 22, 2006 by unknown

Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/merge-5.1

parents 1b6e7fdf 71ffac7e

configure.in

+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.8-beta)
		AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

support-files/mysql.spec.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -709,7 +709,7 @@ fi
		# itself - note that they must be ordered by date (important when
		# merging BK trees)
		%changelog
		* Mon Feb 20 03:04:32 CET 2006
		* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>

		- Reintroduced a max build
		- Limited testing of 'debug' and 'max' servers