merged

BitKeeper/etc/ignore:
  auto-union

.bzrignore

@@ -193,6 +193,7 @@ configure
 core
 db-*.*.*
 dbug/user.t
+depcomp
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
@@ -211,6 +212,7 @@ innobase/conftest.s1
 innobase/conftest.subs
 innobase/ib_config.h
 innobase/ib_config.h.in
+innobase/stamp-h1
 isam/isamchk
 isam/isamlog
 isam/pack_isam
@@ -468,6 +470,7 @@ sql/sql_yacc.cc
 sql/sql_yacc.h
 stamp-h
 stamp-h.in
+stamp-h1
 strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
@@ -494,5 +497,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-innobase/stamp-h1
-stamp-h1

sql/sql_base.cc

@@ -1844,6 +1844,7 @@ bool setup_tables(TABLE_LIST *tables)
 	DBUG_RETURN(1);
       table->keys_in_use_for_query &= ~map;
     }
+    table->used_keys &= table->keys_in_use_for_query;
     if (table_list->shared)
     {
       /* Clear query_id that may have been set by previous select */