diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-05-04 16:37:30 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-05-04 16:37:30 +0300 |
| commit | 27f581a0a65a91b089edafa0844acd4af7310146 (patch) | |
| tree | 6044b00f62117d52ebae6c52fa1ceae2ae7f2c4e /sql/sql_select.h | |
| parent | fe4dc96c1973cd7f8a4ae91f41d5162118237ca6 (diff) | |
| parent | 1084f2d62bca2ed1347cb3c4cfdb7882967ab6c6 (diff) | |
| download | mariadb-git-27f581a0a65a91b089edafa0844acd4af7310146.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B27531-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27531-5.1-opt
mysql-test/r/cast.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/subselect.result:
merge of 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
merge of 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index ca37c7bd274..644224d1bed 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -473,6 +473,7 @@ public: void cleanup(bool full); void clear(); bool save_join_tab(); + bool init_save_join_tab(); bool send_row_on_empty_set() { return (do_send_rows && tmp_table_param.sum_func_count != 0 && |