more mysql_create_view link/unlink woes

vuvova · vuvova · commit 0b5dc6268f44 · 2020-06-12T14:23:05.000+02:00
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
@@ -432,7 +432,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   if (check_dependencies_in_with_clauses(lex->with_clauses_list))
   {
     res= TRUE;
-    goto err;
+    goto err_no_relink;
   }
 
   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) ||
       open_and_lock_tables(thd, lex->query_tables, TRUE, 0))
   {
-    view= lex->unlink_first_table(&link_to_local);
     res= TRUE;
-    goto err;
+    goto err_no_relink;
   }
 
 #ifdef WITH_WSREP
@@ -723,6 +722,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
 #ifdef WITH_WSREP
 wsrep_error_label:
   res= true;
+  goto err_no_relink;
 #endif
 
 err:

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ bool mysql_create_view(THD thd, TABLE_LIST views,`
`432`	`432`	`if (check_dependencies_in_with_clauses(lex->with_clauses_list))`
`433`	`433`	`{`
`434`	`434`	`res= TRUE;`
`435`		`- goto err;`
	`435`	`+ goto err_no_relink;`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);`
`@@ -449,9 +449,8 @@ bool mysql_create_view(THD thd, TABLE_LIST views,`
`449`	`449`	`if (thd->open_temporary_tables(lex->query_tables) \|\|`
`450`	`450`	`open_and_lock_tables(thd, lex->query_tables, TRUE, 0))`
`451`	`451`	`{`
`452`		`- view= lex->unlink_first_table(&link_to_local);`
`453`	`452`	`res= TRUE;`
`454`		`- goto err;`
	`453`	`+ goto err_no_relink;`
`455`	`454`	`}`
`456`	`455`
`457`	`456`	`#ifdef WITH_WSREP`
`@@ -723,6 +722,7 @@ bool mysql_create_view(THD thd, TABLE_LIST views,`
`723`	`722`	`#ifdef WITH_WSREP`
`724`	`723`	`wsrep_error_label:`
`725`	`724`	`res= true;`
	`725`	`+ goto err_no_relink;`
`726`	`726`	`#endif`
`727`	`727`
`728`	`728`	`err:`