Commit abac2ef1 authored by salle@geopard.(none)'s avatar salle@geopard.(none)
Browse files

Merge akeremidarski@work.mysql.com:/home/bk/mysql 

into geopard.(none):/storage/bk/mysql-3.23
parents c28069be 6b8bf756

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -321,3 +321,4 @@ sql-bench/innotest1b 
sql-bench/innotest2

sql-bench/innotest2a

sql-bench/innotest2b

depcomp

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@ serg@build.mysql2.com 
serg@serg.mysql.com

serg@sergbook.mysql.com

sinisa@rhols221.adsl.netsonic.fi

walrus@mysql.com

zak@balfor.local

mysql-test/r/select.result

+2 −2
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ fld3 
table	type	possible_keys	key	key_len	ref	rows	Extra

t2	ref	fld3	fld3	30	const	1	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

t2	index	fld3	fld3	30	NULL	1199	where used; Using index

t2	ALL	fld3	NULL	NULL	NULL	1199	where used

table	type	possible_keys	key	key_len	ref	rows	Extra

t2	index	fld3	fld3	30	NULL	1199	where used; Using index

t2	ALL	fld3	NULL	NULL	NULL	1199	where used

table	type	possible_keys	key	key_len	ref	rows	Extra

t2	ref	fld3	fld3	30	const	1	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

sql/sql_base.cc

+1 −0
Original line number Diff line number Diff line
@@ -1834,6 +1834,7 @@ bool setup_tables(TABLE_LIST *tables) 
	DBUG_RETURN(1);

      table->table->keys_in_use_for_query &= ~map;

    }

    table->table->used_keys &= table->table->keys_in_use_for_query;

  }

  if (tablenr > MAX_TABLES)

  {