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

Merge branch '10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-25 10:25:48 +02:00
parent f2033df6ac a544225d0a
commit 27412877db
585 changed files with 79328 additions and 12271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_derived.cc
View File

@ -520,6 +520,8 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->merge_underlying_list != 0));
if (derived->merged_for_insert)
DBUG_RETURN(FALSE);
if (derived->init_derived(thd, FALSE))
DBUG_RETURN(TRUE);
if (derived->is_materialized_derived())
DBUG_RETURN(mysql_derived_prepare(thd, lex, derived));
if ((thd->lex->sql_command == SQLCOM_UPDATE_MULTI ||