diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-11 14:31:43 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-11 14:31:43 +0200 |
| commit | 0f79336948827a8338a427fa2b7559db0e4b073a (patch) | |
| tree | a0acdc8ba696c78fbbfe9f42ea22b62c138f6eae /sql/table.cc | |
| parent | 6d7e9bcc20c97a2e89b653d9a8ff6d58cdffe2f7 (diff) | |
| download | mariadb-git-0f79336948827a8338a427fa2b7559db0e4b073a.tar.gz | |
WL3527: post-merge updates
sql_yacc.yy:
WL3527: updated the diff to use correct parser words
table.cc:
WL3527: exteneded the fix for bug #20604 to fit the new variables
sql_select.cc:
WL3527: renamed used_keys to covering_keys
sql/sql_select.cc:
renamed used_keys to covering_keys
sql/sql_yacc.yy:
WL3527: updated the diff to use correct parser words
sql/table.cc:
WL3527: exteneded the fix for bug #20604 to fit the new variables
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index daec7492500..fd810ae7478 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4272,11 +4272,11 @@ bool st_table_list::process_index_hints(TABLE *table) /* apply USE INDEX */ if (!index_join[INDEX_HINT_USE].is_clear_all() || have_empty_use_join) - table->keys_in_use_for_query= index_join[INDEX_HINT_USE]; + table->keys_in_use_for_query.intersect(index_join[INDEX_HINT_USE]); if (!index_order[INDEX_HINT_USE].is_clear_all() || have_empty_use_order) - table->keys_in_use_for_order_by= index_order[INDEX_HINT_USE]; + table->keys_in_use_for_order_by.intersect (index_order[INDEX_HINT_USE]); if (!index_group[INDEX_HINT_USE].is_clear_all() || have_empty_use_group) - table->keys_in_use_for_group_by= index_group[INDEX_HINT_USE]; + table->keys_in_use_for_group_by.intersect (index_group[INDEX_HINT_USE]); /* apply IGNORE INDEX */ table->keys_in_use_for_query.subtract (index_join[INDEX_HINT_IGNORE]); |