Commit fa771db2 authored by unknown's avatar unknown

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

into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
parents cbc851c6 8c14ed42
......@@ -321,3 +321,4 @@ sql-bench/innotest1b
sql-bench/innotest2
sql-bench/innotest2a
sql-bench/innotest2b
depcomp
......@@ -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
......@@ -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
......
......@@ -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)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment