diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-12 14:26:06 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-12 14:26:06 +0200 |
| commit | ce55d37929fc91b476541d3a77336a44b20317ac (patch) | |
| tree | 867bf056f51f0338af221431380445d7784b2c0e /sql/sql_class.cc | |
| parent | fcd29b78456a47b00763fe249bbee9456bfbf6bb (diff) | |
| parent | 3a3a91ff051abe859589e33fab4b5588e325d55b (diff) | |
| download | mariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz | |
Merge Mariadb 5.1->5.2
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a02ab2bba9e..ba7e0654331 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1883,7 +1883,7 @@ void select_send::cleanup() /* Send data to client. Returns 0 if ok */ -bool select_send::send_data(List<Item> &items) +int select_send::send_data(List<Item> &items) { if (unit->offset_limit_cnt) { // using limit offset,count @@ -2192,7 +2192,7 @@ select_export::prepare(List<Item> &list, SELECT_LEX_UNIT *u) (int) (uchar) (x) == line_sep_char || \ !(x)) -bool select_export::send_data(List<Item> &items) +int select_export::send_data(List<Item> &items) { DBUG_ENTER("select_export::send_data"); @@ -2450,7 +2450,7 @@ select_dump::prepare(List<Item> &list __attribute__((unused)), } -bool select_dump::send_data(List<Item> &items) +int select_dump::send_data(List<Item> &items) { List_iterator_fast<Item> li(items); char buff[MAX_FIELD_WIDTH]; @@ -2495,7 +2495,7 @@ select_subselect::select_subselect(Item_subselect *item_arg) } -bool select_singlerow_subselect::send_data(List<Item> &items) +int select_singlerow_subselect::send_data(List<Item> &items) { DBUG_ENTER("select_singlerow_subselect::send_data"); Item_singlerow_subselect *it= (Item_singlerow_subselect *)item; @@ -2526,7 +2526,7 @@ void select_max_min_finder_subselect::cleanup() } -bool select_max_min_finder_subselect::send_data(List<Item> &items) +int select_max_min_finder_subselect::send_data(List<Item> &items) { DBUG_ENTER("select_max_min_finder_subselect::send_data"); Item_maxmin_subselect *it= (Item_maxmin_subselect *)item; @@ -2630,7 +2630,7 @@ bool select_max_min_finder_subselect::cmp_str() sortcmp(val1, val2, cache->collation.collation) < 0); } -bool select_exists_subselect::send_data(List<Item> &items) +int select_exists_subselect::send_data(List<Item> &items) { DBUG_ENTER("select_exists_subselect::send_data"); Item_exists_subselect *it= (Item_exists_subselect *)item; @@ -2982,7 +2982,7 @@ Statement_map::~Statement_map() hash_free(&st_hash); } -bool select_dumpvar::send_data(List<Item> &items) +int select_dumpvar::send_data(List<Item> &items) { List_iterator_fast<my_var> var_li(var_list); List_iterator<Item> it(items); |