database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-09 16:33:48 +01:00
parent 106664f8e8 03dabfa84d
commit 3e8155c637
61 changed files with 746 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_derived.cc
View File

@@ -663,6 +663,8 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
unit->derived= derived;
derived->fill_me= FALSE;
if (!(derived->derived_result= new select_union))
DBUG_RETURN(TRUE); // out of memory