Commit fb70eb77 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-22878 galera.wsrep_strict_ddl hangs in 10.5 after merge

if mysql_create_view is aborted when `view` isn't unlinked,
it should not be linked back on cleanup
parent efa67ee0
......@@ -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)))
{
res= TRUE;
goto err;
goto err_no_relink;
}
#endif
......@@ -727,6 +727,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
err:
lex->link_first_table_back(view, link_to_local);
err_no_relink:
unit->cleanup();
DBUG_RETURN(res || thd->is_error());
}
......
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