mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
This commit is contained in:
@@ -275,7 +275,7 @@ bool select_send::send_fields(List<Item> &list,uint flag)
|
||||
|
||||
bool select_send::send_data(List<Item> &items)
|
||||
{
|
||||
List_iterator<Item> li(items);
|
||||
List_iterator_fast<Item> li(items);
|
||||
String *packet= &thd->packet;
|
||||
DBUG_ENTER("send_data");
|
||||
|
||||
@@ -300,12 +300,6 @@ bool select_send::send_data(List<Item> &items)
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
|
||||
void select_send::send_error(uint errcode,const char *err)
|
||||
{
|
||||
::send_error(&thd->net,errcode,err);
|
||||
}
|
||||
|
||||
bool select_send::send_eof()
|
||||
{
|
||||
/* Unlock tables before sending packet to gain some speed */
|
||||
@@ -368,7 +362,7 @@ select_export::prepare(List<Item> &list)
|
||||
}
|
||||
/* Check if there is any blobs in data */
|
||||
{
|
||||
List_iterator<Item> li(list);
|
||||
List_iterator_fast<Item> li(list);
|
||||
Item *item;
|
||||
while ((item=li++))
|
||||
{
|
||||
@@ -415,7 +409,7 @@ bool select_export::send_data(List<Item> &items)
|
||||
Item *item;
|
||||
char *buff_ptr=buff;
|
||||
uint used_length=0,items_left=items.elements;
|
||||
List_iterator<Item> li(items);
|
||||
List_iterator_fast<Item> li(items);
|
||||
|
||||
if (my_b_write(&cache,(byte*) exchange->line_start->ptr(),
|
||||
exchange->line_start->length()))
|
||||
@@ -608,7 +602,7 @@ select_dump::prepare(List<Item> &list __attribute__((unused)))
|
||||
|
||||
bool select_dump::send_data(List<Item> &items)
|
||||
{
|
||||
List_iterator<Item> li(items);
|
||||
List_iterator_fast<Item> li(items);
|
||||
char buff[MAX_FIELD_WIDTH];
|
||||
String tmp(buff,sizeof(buff)),*res;
|
||||
tmp.length(0);
|
||||
|
||||
Reference in New Issue
Block a user