diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 17:13:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 22:59:19 +0300 |
| commit | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (patch) | |
| tree | 660faff324d2f66e57e2800155196739bf972dc1 /sql/opt_subselect.cc | |
| parent | f3f23b5c4bdc669ad0af4a1c79bd70c40ed9c594 (diff) | |
| parent | 07e89bf7d15ba9e9a3b21d087c20d687446b2ff7 (diff) | |
| download | mariadb-git-8a0944080c950349aaf7c81bc8f8c63b262f98eb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 50f7efd6d65..83840d65876 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -697,9 +697,8 @@ int check_and_do_in_subquery_rewrites(JOIN *join) { DBUG_PRINT("info", ("Subquery can't be converted to merged semi-join")); /* Test if the user has set a legal combination of optimizer switches. */ - if (!optimizer_flag(thd, OPTIMIZER_SWITCH_IN_TO_EXISTS) && - !optimizer_flag(thd, OPTIMIZER_SWITCH_MATERIALIZATION)) - my_error(ER_ILLEGAL_SUBQUERY_OPTIMIZER_SWITCHES, MYF(0)); + DBUG_ASSERT(optimizer_flag(thd, OPTIMIZER_SWITCH_IN_TO_EXISTS | + OPTIMIZER_SWITCH_MATERIALIZATION)); /* Transform each subquery predicate according to its overloaded transformer. |