summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-22 13:20:44 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-22 13:20:44 +0200
commitca80e14a882b1928350ef0522607cd1011048941 (patch)
tree05d992be3d25cf47e38c7bc1ea2dacee485f33c5 /sql/item_cmpfunc.h
parentc23d4700e6d9ea4f32eda6965ffc907fa83425e8 (diff)
parent1c60f40868f6067be81a50198e1c72df08814adf (diff)
downloadmariadb-git-ca80e14a882b1928350ef0522607cd1011048941.tar.gz
Merge 10.3 into 10.4
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 d78977544c7..adf6f33c55f 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -2328,7 +2328,7 @@ class Item_func_in :public Item_func_opt_neg,
{
for (uint i= 0; i < nitems; i++)
{
- if (!items[i]->const_item())
+ if (!items[i]->const_item() || items[i]->is_expensive())
return false;
}
return true;