diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-06-12 13:21:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-06-12 14:23:05 +0200 |
| commit | 0b5dc6268f44b0fc8d716c7c4942a6bc5e86871f (patch) | |
| tree | 4769e9d6baf0d67f264b33303b4fe3e750f89c9c | |
| parent | fb70eb773c40f9af4f9afb58f9c33a1c3eca6417 (diff) | |
| download | mariadb-git-0b5dc6268f44b0fc8d716c7c4942a6bc5e86871f.tar.gz | |
more mysql_create_view link/unlink woes
| -rw-r--r-- | sql/sql_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 557bdb71f93..6666f2ef1c3 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -432,7 +432,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, if (check_dependencies_in_with_clauses(lex->with_clauses_list)) { res= TRUE; - goto err; + goto err_no_relink; } WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); @@ -449,9 +449,8 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, if (thd->open_temporary_tables(lex->query_tables) || open_and_lock_tables(thd, lex->query_tables, TRUE, 0)) { - view= lex->unlink_first_table(&link_to_local); res= TRUE; - goto err; + goto err_no_relink; } #ifdef WITH_WSREP @@ -723,6 +722,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, #ifdef WITH_WSREP wsrep_error_label: res= true; + goto err_no_relink; #endif err: |