database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-02 11:05:29 +02:00
parent 5ec40fbb27 09ec8e2e22
commit ef7cb0a0b5
98 changed files with 966 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_view.cc
View File

@ -450,9 +450,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;
}
view= lex->unlink_first_table(&link_to_local);
@ -703,10 +702,12 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
WSREP_ERROR_LABEL:
res= TRUE;
goto err_no_relink;
err:
THD_STAGE_INFO(thd, stage_end);
lex->link_first_table_back(view, link_to_local);
err_no_relink:
unit->cleanup();
DBUG_RETURN(res || thd->is_error());
}