summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-08-03 13:41:29 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-08-03 13:41:29 +0200
commitc32f71af7e4b747de223bf6b44e691941f5997cf (patch)
tree03270b9a849e165f1c8605102ee06bced2331477 /sql/item_cmpfunc.h
parent4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff)
parent555c6632c69d707cc1641ef396e7b66a65f14bdc (diff)
downloadmariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz
Merge branch '10.2' into 10.3
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 29c32be1c80..f22ef0a6c3c 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -172,7 +172,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,