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

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

Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
c4787eec · msvensson@neptunus.(none) · f80d3489 · 08d8be14 · c4787eec · c4787eec
Commit c4787eec authored May 19, 2005 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

configure.in configure.in +1 -1

sql/opt_range.cc sql/opt_range.cc +1 -2

No files found.
--- a/configure.in
+++ b/configure.in
@@ -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

--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -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,