From fb70eb773c40f9af4f9afb58f9c33a1c3eca6417 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 12 Jun 2020 13:18:41 +0200
Subject: [PATCH] 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
---
 sql/sql_view.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 30fadcc63d2..557bdb71f93 100644
--- 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 @@ wsrep_error_label:
 
 err:
   lex->link_first_table_back(view, link_to_local);
+err_no_relink:
   unit->cleanup();
   DBUG_RETURN(res || thd->is_error());
 }