database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-22878 galera.wsrep_strict_ddl hangs in 10.5 after merge

Browse Source 
if mysql_create_view is aborted when `view` isn't unlinked,
it should not be linked back on cleanup
This commit is contained in:
Sergei Golubchik
2020-06-12 13:18:41 +02:00
parent efa67ee0ea
commit fb70eb773c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_view.cc
View File

@ -458,7 +458,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
if(!wsrep_should_replicate_ddl_iterate(thd, static_cast<const TABLE_LIST *>(tables))) if(!wsrep_should_replicate_ddl_iterate(thd, static_cast<const TABLE_LIST *>(tables)))
{ {
res= TRUE; res= TRUE;
goto err; goto err_no_relink;
} }
#endif #endif
@ -727,6 +727,7 @@ wsrep_error_label:
err: err:
lex->link_first_table_back(view, link_to_local); lex->link_first_table_back(view, link_to_local);
err_no_relink:
unit->cleanup(); unit->cleanup();
DBUG_RETURN(res || thd->is_error()); DBUG_RETURN(res || thd->is_error());
} }