revision-id: 001dc26012b69757cd35f1a59e4768e577f8ec5c (mariadb-10.11.1-109-g001dc26) parent(s): cce24adeefdbd0262d9df9410c5cd4928bcf71e2 author: Igor Babaev committer: Igor Babaev timestamp: 2023-03-08 12:05:28 -0800 message: Another attempt to rebase MDEV-7487 against 11.0.1 --- sql/item_subselect.cc | 4 ---- sql/sql_select.cc | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 320cc11..9e6c205 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2953,13 +2953,9 @@ bool Item_exists_subselect::select_prepare_to_be_in() if (!optimizer && (thd->lex->sql_command == SQLCOM_SELECT || thd->lex->sql_command == SQLCOM_UPDATE_MULTI || -<<<<<<< c8ab3596380cd05a7e29350b1da0d32ee025a70c - thd->lex->sql_command == SQLCOM_DELETE_MULTI) && -======= thd->lex->sql_command == SQLCOM_DELETE_MULTI || thd->lex->sql_command == SQLCOM_UPDATE || thd->lex->sql_command == SQLCOM_DELETE) && ->>>>>>> Fixes of MDEV-30538 and MDEV-30586 for 10.4 adjusted for 11.0. !unit->first_select()->is_part_of_union() && optimizer_flag(thd, OPTIMIZER_SWITCH_EXISTS_TO_IN) && (is_top_level_item() || diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 52de1fd..86b09dc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -32592,7 +32592,8 @@ bool Sql_cmd_dml::execute_inner(THD *thd) if (unlikely(thd->is_error())) goto err; - join->exec(); + if (join->exec()) + goto err; if (thd->lex->describe & DESCRIBE_EXTENDED) {