diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:36:19 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:36:19 +0400 |
commit | 3fd2f50b6c24a41cc9840c32eeca56175d48a566 (patch) | |
tree | ab9b420b768d8a6eb5ccda680604108cfee71b81 /sql/sql_parse.cc | |
parent | 1c3de291f72f0f05c9ae688dcf8d7d2de972ced8 (diff) | |
parent | b930b18ec3463e47736647c26af0eea07c242a63 (diff) | |
download | mariadb-git-3fd2f50b6c24a41cc9840c32eeca56175d48a566.tar.gz |
Merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 5c5957e7871..703b18098c8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6335,6 +6335,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->table_name_length=table->table.length; ptr->lock_type= lock_type; ptr->updating= test(table_options & TL_OPTION_UPDATING); + /* TODO: remove TL_OPTION_FORCE_INDEX as it looks like it's not used */ ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX); ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES); ptr->derived= table->sel; |