diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
| commit | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch) | |
| tree | af138f2b3739a742c0c38173cdc86ec176fc0edd /sql/sql_tvc.cc | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| download | mariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index ef8e15df838..bf72a8515f1 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -971,7 +971,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; |