diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-12 16:27:52 +0200 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-12 16:27:52 +0200 |
commit | a73fb925da2687803112aa6dfaca98b309ac7fbf (patch) | |
tree | 73e253f732d7848cb199971f7bab1b413f2572d3 /sql/sql_base.cc | |
parent | 9367f3af96e7ed78425c3ed9db82f1f702f34146 (diff) | |
parent | 2e96b7050c2aa62eb2887e269c85545e2f1da252 (diff) | |
download | mariadb-git-a73fb925da2687803112aa6dfaca98b309ac7fbf.tar.gz |
Merge
mysql-test/r/select.result:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 23ba04bd6ed..a700fdc6a1b 100644 --- a/sql/sql_base.cc +++ b/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) { |