diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
| commit | ddc46740a56bf3885ae33dc21e281c063d189abf (patch) | |
| tree | 95de2e32ed970c1370e9c3fa15290b88d13955da /sql/sql_select.h | |
| parent | d61cffa6b1dd8b25dbae2536af1b0b59091b9f06 (diff) | |
| parent | c7db46a2427e933a379d0a8c62221c344a29ea06 (diff) | |
| download | mariadb-git-ddc46740a56bf3885ae33dc21e281c063d189abf.tar.gz | |
Merge 5.5->10.0-base
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 686f159fabf..e52e321650d 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -319,8 +319,9 @@ typedef struct st_join_table { uint used_null_fields; uint used_uneven_bit_fields; enum join_type type; - bool cached_eq_ref_table,eq_ref_table,not_used_in_distinct; - bool sorted; + bool cached_eq_ref_table,eq_ref_table; + bool shortcut_for_distinct; + bool sorted; /* If it's not 0 the number stored this field indicates that the index scan has been chosen to access the table data and we expect to scan |