summaryrefslogtreecommitdiff
path: root/sql/opt_range.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-28 12:25:33 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-28 12:25:33 -0800
commitea7082aee2086b198e69420823e6afff59f1df47 (patch)
tree03554a672012c9bd6d6e2b8f10297cc49dfe8bbe /sql/opt_range.h
parent0dc5ef87d4c5ad21b5ff5ad26187117514d4fbb7 (diff)
parentdccc01a82ab2ef6caf95493320d5e75a3c5ab596 (diff)
downloadmariadb-git-ea7082aee2086b198e69420823e6afff59f1df47.tar.gz
Merge
Diffstat (limited to 'sql/opt_range.h')
-rw-r--r--sql/opt_range.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 1a0a2ee0029..23533578b91 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -515,8 +515,7 @@ public:
Current implementation doesn't detect all cases where index merge could
be used, in particular:
- * index merge+'using index' is not supported (this the consequence of
- the above restriction)
+ * index_merge+'using index' is not supported
* If WHERE part contains complex nested AND and OR conditions, some ways
to retrieve rows using index merge will not be considered. The choice