diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-04-02 14:46:36 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-04-16 08:57:24 +0200 |
| commit | 6c306a729d79504d6dd8efc42db78011cb6956d5 (patch) | |
| tree | a4b6b6d0a3e103d892cb7e8c7e702e08d916aca7 | |
| parent | 3bc863b208d16c0499637dd862c32fc49e748124 (diff) | |
| download | mariadb-git-6c306a729d79504d6dd8efc42db78011cb6956d5.tar.gz | |
Cleanup of derived table interface
| -rw-r--r-- | sql/sql_derived.h | 1 | ||||
| -rw-r--r-- | sql/sql_view.cc | 2 |
2 files changed, 1 insertions, 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); |