database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge Mariadb 5.1->5.2

Browse Source
This commit is contained in:
unknown
2011-04-12 14:26:06 +02:00
parent fcd29b7845 3a3a91ff05
commit ce55d37929
17 changed files with 124 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_class.cc
View File

@@ -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);