diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
| commit | 3e8155c637096da8fd019c42b78746be2bf89944 (patch) | |
| tree | 7df7880c789de7c32fdd76e862170322afe6117c /sql/sql_derived.cc | |
| parent | 106664f8e86d694a9898c3e564bb72290f221bd6 (diff) | |
| parent | 03dabfa84d6bc9a8197c8d9fbe80f2a7f6a5b6ac (diff) | |
| download | mariadb-git-3e8155c637096da8fd019c42b78746be2bf89944.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index fdc615d0fae..f2674cb8dab 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -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 |