summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-08-02 11:05:29 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-08-02 11:05:29 +0200
commitef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch)
tree5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /sql/item_cmpfunc.h
parent5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff)
parent09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff)
downloadmariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 613fb75bcd6..cad179dff74 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -155,7 +155,7 @@ protected:
/*
Return the full select tree for "field_item" and "value":
- a single SEL_TREE if the field is not in a multiple equality, or
- - a conjuction of all SEL_TREEs for all fields from
+ - a conjunction of all SEL_TREEs for all fields from
the same multiple equality with "field_item".
*/
SEL_TREE *get_full_func_mm_tree(RANGE_OPT_PARAM *param,