Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057
This commit is contained in:
ram@gw.mysql.r18.ru 2004-10-18 12:48:11 +05:00
commit 90ec1b6663

View file

@ -237,7 +237,7 @@ int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, char* res_buf,
char* res_buf_end=res_buf+res_buf_size;
char* net_buf=(char*) con->net.read_pos, *net_buf_end;
int res_buf_shift=RES_BUF_SHIFT;
uint num_bytes;
ulong num_bytes;
if (res_buf_size<RES_BUF_SHIFT)
{