diff options
| author | unknown <evgen@moonbone.local> | 2007-04-15 12:05:13 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-04-15 12:05:13 +0400 |
| commit | 663757ea2559823d0ed639aa7d09653535110b8e (patch) | |
| tree | b537d185a31ec756d7fdb93c7cc69323c615d976 /sql/sql_union.cc | |
| parent | ebb4e90cd9e3aeeeeabd8de5f91670be4fb20c82 (diff) | |
| parent | 3e8252ffc6ff28df8b0dbadcfea6ca506a731cbf (diff) | |
| download | mariadb-git-663757ea2559823d0ed639aa7d09653535110b8e.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
mysql-test/r/subselect3.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c3635e24407..bc81679a7fd 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -745,6 +745,7 @@ bool st_select_lex::cleanup() error= (bool) ((uint) error | (uint) lex_unit->cleanup()); } non_agg_fields.empty(); + inner_refs_list.empty(); DBUG_RETURN(error); } |