Merge

mysql-test/r/select.result:
  Auto merged
sql/sql_base.cc:
  Auto merged

sql/sql_base.cc

@@ -1851,6 +1851,7 @@ bool setup_tables(TABLE_LIST *tables)
       for (Field **ptr=table->field ; *ptr ; ptr++)
 	(*ptr)->query_id=0;
     }
+    table->used_keys&= table->keys_in_use_for_query;
   }
   if (tablenr > MAX_TABLES)
   {