diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
commit | 69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3 (patch) | |
tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/table.h | |
parent | ea84da107a8d8f6b061d00dcf76c3369f8a96868 (diff) | |
parent | 684b1d39ac7eab6ff5d9095aaa25dcea35b88a28 (diff) | |
download | mariadb-git-69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3.tar.gz |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 7c43ab339e5..f9da0637b4b 100644 --- a/sql/table.h +++ b/sql/table.h @@ -755,6 +755,18 @@ struct st_table { bytes, it would take up 4. */ my_bool force_index; + + /** + Flag set when the statement contains FORCE INDEX FOR ORDER BY + See TABLE_LIST::process_index_hints(). + */ + my_bool force_index_order; + + /** + Flag set when the statement contains FORCE INDEX FOR GROUP BY + See TABLE_LIST::process_index_hints(). + */ + my_bool force_index_group; my_bool distinct,const_table,no_rows; /** |