summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-03-01 15:54:21 +0200
committerunknown <timour@askmonty.org>2011-03-01 15:54:21 +0200
commit71e9d9489556f04ce22ffa924bcdd512f82caa85 (patch)
tree8e495932b6729ac9c05a454991aaf79352da7520 /sql/sql_select.h
parent7895c35874c76a88d7b1be609f06fbe6f266aab7 (diff)
parentc6ba9598026b06f5d64e7508abb652ac22d50e48 (diff)
downloadmariadb-git-71e9d9489556f04ce22ffa924bcdd512f82caa85.tar.gz
MWL#89
Merge 5.3 into 5.3-mwl89.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 67c901ebd66..03d135b7c4b 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -135,7 +135,7 @@ typedef struct st_table_ref
enum join_type { JT_UNKNOWN,JT_SYSTEM,JT_CONST,JT_EQ_REF,JT_REF,JT_MAYBE_REF,
JT_ALL, JT_RANGE, JT_NEXT, JT_FT, JT_REF_OR_NULL,
JT_UNIQUE_SUBQUERY, JT_INDEX_SUBQUERY, JT_INDEX_MERGE,
- JT_HASH};
+ JT_HASH, JT_HASH_RANGE, JT_HASH_NEXT, JT_HASH_INDEX_MERGE};
class JOIN;