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_base.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_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index cc6ecda9327..f4d9272eca1 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5372,7 +5372,6 @@ bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags, uint counter; MDL_savepoint mdl_savepoint= thd->mdl_context.mdl_savepoint(); DBUG_ENTER("open_normal_and_derived_tables"); - DBUG_ASSERT(!thd->fill_derived_tables()); if (open_tables(thd, &tables, &counter, flags, &prelocking_strategy) || mysql_handle_derived(thd->lex, dt_phases)) goto end; @@ -5430,7 +5429,7 @@ bool open_tables_only_view_structure(THD *thd, TABLE_LIST *table_list, MYSQL_OPEN_GET_NEW_TABLE | (can_deadlock ? MYSQL_OPEN_FAIL_ON_MDL_CONFLICT : 0)), - DT_INIT | DT_PREPARE | DT_CREATE)); + DT_INIT | DT_PREPARE)); /* Restore old value of sql_command back as it is being looked at in process_table() function. |