summaryrefslogtreecommitdiff
path: root/sql/sql_tvc.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-01 15:28:11 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-04 09:30:43 +0200
commit08b01ace8a7284272662c793b3d93b3ddddc7123 (patch)
tree6ed7dd6b070e9837bfef41611dac646dd1ebcc3e /sql/sql_tvc.cc
parent7e08ac0b41b50195aa79f6ac185bc69a91a960ca (diff)
downloadmariadb-git-08b01ace8a7284272662c793b3d93b3ddddc7123.tar.gz
MDEV-16871 in_predicate_conversion_threshold cannot be set in my.cnf
Diffstat (limited to 'sql/sql_tvc.cc')
-rw-r--r--sql/sql_tvc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc
index c9b55fe210e..816c6fe1089 100644
--- a/sql/sql_tvc.cc
+++ b/sql/sql_tvc.cc
@@ -972,7 +972,8 @@ bool Item_func_in::to_be_transformed_into_in_subq(THD *thd)
if (args[1]->type() == Item::ROW_ITEM)
values_count*= ((Item_row *)(args[1]))->cols();
- if (values_count < thd->variables.in_subquery_conversion_threshold)
+ if (thd->variables.in_subquery_conversion_threshold == 0 ||
+ thd->variables.in_subquery_conversion_threshold > values_count)
return false;
return true;