database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Minor fixes

Browse Source
This commit is contained in:
hf@bisonxp.(none)
2002-07-09 10:39:22 +05:00
parent 94e4fb9db4
commit bc7e8b0915
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -69,3 +69,4 @@ venu@work.mysql.com
worm@altair.is.lan worm@altair.is.lan
zak@balfor.local zak@balfor.local
zak@linux.local zak@linux.local
hf@bisonxp.(none)

6
libmysqld/lib_sql.cc
View File

@ -813,6 +813,12 @@ bool select_send::send_data(List<Item> &items)
DBUG_ENTER("send_data"); DBUG_ENTER("send_data");
if (unit->offset_limit_cnt)
{ // using limit offset,count
unit->offset_limit_cnt--;
DBUG_RETURN(0);
}
thd->packet.length(0); thd->packet.length(0);
while ((item=li++)) while ((item=li++))
{ {

2
sql/sql_handler.cc
View File

@ -232,7 +232,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
goto err; goto err;
} }
} }
my_net_write(&thd->net, (char*)packet->ptr(), packet->length()); SEND_ROW(thd, &thd->net, list.elements, (char*)packet->ptr(), packet->length());
} }
} }
num_rows++; num_rows++;

2
sql/sql_select.cc
View File

@ -7309,6 +7309,6 @@ static void describe_info(THD *thd, const char *info)
return; /* purecov: inspected */ return; /* purecov: inspected */
packet->length(0); packet->length(0);
net_store_data(packet,info); net_store_data(packet,info);
if (!my_net_write(&thd->net,(char*) packet->ptr(),packet->length())) if (!SEND_ROW(thd, &thd->net, field_list.elements, (char*) packet->ptr(),packet->length()))
send_eof(&thd->net); send_eof(&thd->net);
} }

4
sql/sql_table.cc
View File

@ -1101,7 +1101,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
err_msg=ER(ER_CHECK_NO_SUCH_TABLE); err_msg=ER(ER_CHECK_NO_SUCH_TABLE);
net_store_data(packet, err_msg); net_store_data(packet, err_msg);
thd->net.last_error[0]=0; thd->net.last_error[0]=0;
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length())) packet->length()))
goto err; goto err;
continue; continue;
@ -1116,7 +1116,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
net_store_data(packet, buff); net_store_data(packet, buff);
close_thread_tables(thd); close_thread_tables(thd);
table->table=0; // For query cache table->table=0; // For query cache
if (my_net_write(&thd->net, (char*) thd->packet.ptr(), if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length())) packet->length()))
goto err; goto err;
continue; continue;