revision-id: a90622644c11568c2bf982492d2f47bc164ddfef (mariadb-10.4.3-106-ga90622644c1) parent(s): 3e1f3d3e2f14a157121b92bd4b76e986f1846454 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-04-02 14:46:36 +0200 message: Cleanup of derived table interface --- sql/sql_derived.h | 1 - sql/sql_view.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/sql_derived.h b/sql/sql_derived.h index abfdb007072..2454d40ba79 100644 --- a/sql/sql_derived.h +++ b/sql/sql_derived.h @@ -22,7 +22,6 @@ struct LEX; bool mysql_handle_derived(LEX *lex, uint phases); bool mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases); -bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived); bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived); diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 3014065d28b..13b5caba539 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1200,7 +1200,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table, in which case the reinit call wasn't done. See MDEV-6668 for details. */ - mysql_derived_reinit(thd, NULL, table); + mysql_handle_single_derived(thd->lex, table, DT_REINIT); DEBUG_SYNC(thd, "after_cached_view_opened"); DBUG_RETURN(0);