Cleanup of derived table interface

6c306a72 · Oleksandr Byelkin · 3bc863b2 · 6c306a72 · 6c306a72
Commit 6c306a72 authored Apr 02, 2019 by Oleksandr Byelkin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/sql_derived.h sql/sql_derived.h +0 -1

sql/sql_view.cc sql/sql_view.cc +1 -1

No files found.
--- 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);

--- 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);