diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-12 17:43:03 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-12 17:43:03 +0200 |
| commit | eae8e515b4f8a5b1559b6910cb7432b10293c782 (patch) | |
| tree | ad09d30354014cc88d13ba9f52e0083ae8cf56ba | |
| parent | 31201e66171648bb322845477e38577fe603ee96 (diff) | |
| parent | 8c14ed4230fb808c4bc5d7664345a909eb190520 (diff) | |
| download | mariadb-git-eae8e515b4f8a5b1559b6910cb7432b10293c782.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 4 | ||||
| -rw-r--r-- | sql/sql_base.cc | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 63e77a9e30b..0cc24f9dbf6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -321,3 +321,4 @@ sql-bench/innotest1b sql-bench/innotest2 sql-bench/innotest2a sql-bench/innotest2b +depcomp diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 413b03130f6..5ac5de05f97 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -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 diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 6b445442058..fb120442385 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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) { |