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 | 3c899918434ab3524201d270e2b4d73a424c1084 (patch) | |
| tree | 73e253f732d7848cb199971f7bab1b413f2572d3 /sql | |
| parent | 8b5dd649989c5918e09d507e3887813cc2158a4c (diff) | |
| parent | e2d1ab84d14bace07578899b1b64e4a55111f8a5 (diff) | |
| download | mariadb-git-3c899918434ab3524201d270e2b4d73a424c1084.tar.gz | |
Merge
mysql-test/r/select.result:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql')
| -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) { |