Commit 50c4ed93 authored May 19, 2005 by unknown

Merge mysqldev@production.mysql.com:my/mysql-5.0-build

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build

parents 93be6a80 bdf5dbcd

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required.
		AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# Don't forget to also update the NDB lines below.
		AM_INIT_AUTOMAKE(mysql, 5.0.7-beta)
		AM_INIT_AUTOMAKE(mysql, 5.0.6-beta)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

sql/opt_range.cc

+1 −2

Original line number	Diff line number	Diff line
		@@ -713,8 +713,7 @@ SQL_SELECT::~SQL_SELECT()

		QUICK_SELECT_I::QUICK_SELECT_I()
		:max_used_key_length(0),
		used_key_parts(0),
		records(0)
		used_key_parts(0)
		{}

		QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD thd, TABLE table, uint key_nr,