mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
more mysql_create_view link/unlink woes
This commit is contained in:
@@ -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,
|
|||||||
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,
|
|||||||
#ifdef WITH_WSREP
|
#ifdef WITH_WSREP
|
||||||
wsrep_error_label:
|
wsrep_error_label:
|
||||||
res= true;
|
res= true;
|
||||||
|
goto err_no_relink;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
Reference in New Issue
Block a user