Skip to content

M
MariaDB
Commit 0b5dc626 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

more mysql_create_view link/unlink woes

parent fb70eb77
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sql/sql_view.cc
View file @ 0b5dc626
...@@ -432,7 +432,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, ...@@ -432,7 +432,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
if (check_dependencies_in_with_clauses(lex->with_clauses_list)) if (check_dependencies_in_with_clauses(lex->with_clauses_list))
{ {
res= TRUE; res= TRUE;
goto err; goto err_no_relink;
} }
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
...@@ -449,9 +449,8 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, ...@@ -449,9 +449,8 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
if (thd->open_temporary_tables(lex->query_tables) || if (thd->open_temporary_tables(lex->query_tables) ||
open_and_lock_tables(thd, lex->query_tables, TRUE, 0)) open_and_lock_tables(thd, lex->query_tables, TRUE, 0))
{ {
view= lex->unlink_first_table(&link_to_local);
res= TRUE; res= TRUE;
goto err; goto err_no_relink;
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
...@@ -723,6 +722,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, ...@@ -723,6 +722,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
#ifdef WITH_WSREP #ifdef WITH_WSREP
wsrep_error_label: wsrep_error_label:
res= true; res= true;
goto err_no_relink;
#endif #endif
err: err:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7