diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
| commit | 509e4990af4d99e9d3c790eabe1c1705ae910b55 (patch) | |
| tree | 02d4ca9409711baef3ec163adc402f2c380df7c8 /sql/sql_derived.cc | |
| parent | 0cc811c633d1fe5290b10fa49fad0a4b889383fa (diff) | |
| parent | 4f143a88bcb36e94e9edba8a3c5b4a350dcd9bf9 (diff) | |
| download | mariadb-git-509e4990af4d99e9d3c790eabe1c1705ae910b55.tar.gz | |
Merge branch bb-10.3-release into bb-10.4-release
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 132872c4a9e..fc01dcdc750 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -73,7 +73,6 @@ bool mysql_handle_derived(LEX *lex, uint phases) { bool res= FALSE; - THD *thd= lex->thd; DBUG_ENTER("mysql_handle_derived"); DBUG_PRINT("enter", ("phases: 0x%x", phases)); if (!lex->derived_tables) @@ -88,8 +87,6 @@ mysql_handle_derived(LEX *lex, uint phases) break; if (!(phases & phase_flag)) continue; - if (phase_flag >= DT_CREATE && !thd->fill_derived_tables()) - break; for (SELECT_LEX *sl= lex->all_selects_list; sl && !res; @@ -173,7 +170,6 @@ bool mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases) { bool res= FALSE; - THD *thd= lex->thd; uint8 allowed_phases= (derived->is_merged_derived() ? DT_PHASES_MERGE : DT_PHASES_MATERIALIZE); DBUG_ENTER("mysql_handle_single_derived"); @@ -200,8 +196,6 @@ mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases) if (phase_flag != DT_PREPARE && !(allowed_phases & phase_flag)) continue; - if (phase_flag >= DT_CREATE && !thd->fill_derived_tables()) - break; if ((res= (*processors[phase])(lex->thd, lex, derived))) break; |