database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge with MariaDB 5.2

Browse Source
This commit is contained in:
Michael Widenius
2011-05-10 18:17:43 +03:00
parent e843297d12 8882d71f3f
commit f34be18938
639 changed files with 11529 additions and 4439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_class.cc
View File

@@ -1890,7 +1890,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
@@ -2199,7 +2199,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");
@@ -2456,7 +2456,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];
@@ -2501,7 +2501,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;
@@ -2532,7 +2532,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;
@@ -2636,7 +2636,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;
@@ -2988,7 +2988,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);
@@ -3091,15 +3091,16 @@ void select_materialize_with_stats::cleanup()
@return FALSE on success
*/
bool select_materialize_with_stats::send_data(List<Item> &items)
int select_materialize_with_stats::send_data(List<Item> &items)
{
List_iterator_fast<Item> item_it(items);
Item *cur_item;
Column_statistics *cur_col_stat= col_stat;
uint nulls_in_row= 0;
int res;
if (select_union::send_data(items))
return 1;
if ((res= select_union::send_data(items)))
return res;
/* Skip duplicate rows. */
if (write_err == HA_ERR_FOUND_DUPP_KEY ||
write_err == HA_ERR_FOUND_DUPP_UNIQUE)