diff options
| author | bell@sanja.is.com.ua <> | 2004-02-08 20:14:13 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-02-08 20:14:13 +0200 |
| commit | 69e2460bd4f5c122017a281e8fdbbc6dedb5a671 (patch) | |
| tree | 14b2b58964802549177419493c886e1dd62be7e3 /sql/sql_select.cc | |
| parent | 8eb590a71ec484146432cf6ae37d51fe4e6f814b (diff) | |
| download | mariadb-git-69e2460bd4f5c122017a281e8fdbbc6dedb5a671.tar.gz | |
fixed subquery with PS (BUG#2462)
fixed UNION preparation
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ad5799f4c42..e5cb306c81b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -330,8 +330,7 @@ JOIN::prepare(Item ***rref_pointer_array, // Is it subselect { Item_subselect *subselect; - if ((subselect= select_lex->master_unit()->item) && - select_lex->linkage != GLOBAL_OPTIONS_TYPE) + if ((subselect= select_lex->master_unit()->item)) { Item_subselect::trans_res res; if ((res= subselect->select_transformer(this)) != @@ -1527,10 +1526,10 @@ JOIN::cleanup() lock=0; // It's faster to unlock later join_free(1); - if (exec_tmp_table1) - free_tmp_table(thd, exec_tmp_table1); - if (exec_tmp_table2) - free_tmp_table(thd, exec_tmp_table2); + if (exec_tmp_table1) + free_tmp_table(thd, exec_tmp_table1); + if (exec_tmp_table2) + free_tmp_table(thd, exec_tmp_table2); delete select; delete_dynamic(&keyuse); delete procedure; |