MDEV-22878 galera.wsrep_strict_ddl hangs in 10.5 after merge

vuvova · vuvova · commit fb70eb773c40 · 2020-06-12T14:23:05.000+02:00
if mysql_create_view is aborted when `view` isn't unlinked,
it should not be linked back on cleanup
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
@@ -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());
 }

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ bool mysql_create_view(THD thd, TABLE_LIST views,`
`458`	`458`	`if(!wsrep_should_replicate_ddl_iterate(thd, static_cast<const TABLE_LIST *>(tables)))`
`459`	`459`	`{`
`460`	`460`	`res= TRUE;`
`461`		`- goto err;`
	`461`	`+ goto err_no_relink;`
`462`	`462`	`}`
`463`	`463`	`#endif`
`464`	`464`
`@@ -727,6 +727,7 @@ bool mysql_create_view(THD thd, TABLE_LIST views,`
`727`	`727`
`728`	`728`	`err:`
`729`	`729`	`lex->link_first_table_back(view, link_to_local);`
	`730`	`+err_no_relink:`
`730`	`731`	`unit->cleanup();`
`731`	`732`	`DBUG_RETURN(res \|\| thd->is_error());`
`732`	`733`	`}`