diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:17:08 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:17:08 +0400 |
| commit | 3251065aef83d6cc8088b03e56f6f3242786de66 (patch) | |
| tree | 18863557a9b43b168f930debb4fdcc69a37f4e82 /sql/mysql_priv.h | |
| parent | 9b4b453ab8a5f7c7fa06b4ef22b6a10867fac187 (diff) | |
| parent | bf14598c9903067474a7cdf1c49bca9f52d0c55a (diff) | |
| download | mariadb-git-3251065aef83d6cc8088b03e56f6f3242786de66.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 1ce6bf0df8a..e4effd12af7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2435,6 +2435,7 @@ inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr) table->tablenr= tablenr; table->map= (table_map) 1 << tablenr; table->force_index= table_list->force_index; + table->force_index_order= table->force_index_group= 0; table->covering_keys= table->s->keys_for_keyread; table->merge_keys.clear_all(); } |