summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-08-04 17:24:15 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-08-04 17:24:15 +0200
commit48b5777ebda9bf14c60ad05298dac67933e9799f (patch)
tree2c023b5cc7811faea8a9b4ad82998e4624c29068 /sql/item_cmpfunc.h
parentbbd70fcc43cc889e4593594ee5ca436fe1433aac (diff)
parent9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff)
downloadmariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz
Merge branch '10.4' into 10.5
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 b943bfc90da..23d04a57580 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -178,7 +178,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,