diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-25 12:04:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-25 12:04:45 +0300 |
| commit | 4725792bf3ca17b581586f54a2e0058b4a18cff1 (patch) | |
| tree | 0c1ae1ec376660682d940027fe70bd6d4e8afe58 /sql/sql_derived.cc | |
| parent | b8fad8c6bffbc7e43796fffe607b23075cfc3e2b (diff) | |
| parent | e4394cc5472a18d791b48e56784742b512de2bf8 (diff) | |
| download | mariadb-git-4725792bf3ca17b581586f54a2e0058b4a18cff1.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index ecd5e7c21fe..796d285d80a 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -382,10 +382,6 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) DBUG_RETURN(FALSE); } - if (thd->lex->sql_command == SQLCOM_UPDATE_MULTI || - thd->lex->sql_command == SQLCOM_DELETE_MULTI) - thd->save_prep_leaf_list= TRUE; - arena= thd->activate_stmt_arena_if_needed(&backup); // For easier test if (!derived->merged_for_insert || @@ -459,6 +455,7 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) derived->on_expr= expr; derived->prep_on_expr= expr->copy_andor_structure(thd); } + thd->where= "on clause"; if (derived->on_expr && derived->on_expr->fix_fields_if_needed_for_bool(thd, &derived->on_expr)) { |