diff options
| -rw-r--r-- | .bzrignore | 5 | ||||
| -rw-r--r-- | mysql-test/r/isam.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 4 | ||||
| -rw-r--r-- | sql/sql_base.cc | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/.bzrignore b/.bzrignore index c0a91201e29..d1ea6c7d70e 100644 --- a/.bzrignore +++ b/.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 diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index d19352aad42..0f7224f52da 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -47,14 +47,14 @@ test.t1 optimize status OK check table t1,t2; Table Op Msg_type Msg_text test.t1 check status OK -test.t2 check error The handler for the table doesn't support check/repair +test.t2 check error The handler for the table doesn't support check repair table t1,t2; Table Op Msg_type Msg_text test.t1 repair status OK -test.t2 repair error The handler for the table doesn't support check/repair +test.t2 repair error The handler for the table doesn't support repair check table t2,t1; Table Op Msg_type Msg_text -test.t2 check error The handler for the table doesn't support check/repair +test.t2 check error The handler for the table doesn't support check test.t1 check status OK lock tables t1 write; check table t2,t1; diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 1a40c5b11c3..fdcc7f9cdea 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1331,10 +1331,10 @@ table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index NULL fld3 30 NULL 1199 Using where; Using index +t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index NULL fld3 30 NULL 1199 Using where; Using index +t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 Using where; Using index diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ec2e22d2a5d..cf41d851137 100644 --- a/sql/sql_base.cc +++ b/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 */ |