diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
| commit | 2f20d297f8ea731d845bb220e680ad10c7a927bc (patch) | |
| tree | 9bd18ef1ab766422ba4c51b4ab189e259955a2d0 /sql/sql_derived.cc | |
| parent | a629b5172e96c96c414fca70fffd64c80f2f7e8f (diff) | |
| parent | eb4f2e063c341d9f3644339c68cb01679e782001 (diff) | |
| download | mariadb-git-2f20d297f8ea731d845bb220e680ad10c7a927bc.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 67e7b6115a3..493f231bb39 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -662,6 +662,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) } unit->derived= derived; + derived->fill_me= FALSE; if (!(derived->derived_result= new (thd->mem_root) select_union(thd))) DBUG_RETURN(TRUE); // out of memory |