1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-13 13:01:51 +03:00

Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30396
This commit is contained in:
igor@olga.mysql.com
2007-08-16 17:22:50 -07:00
8 changed files with 142 additions and 29 deletions

View File

@ -4673,9 +4673,17 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL *mysql= stmt->mysql;
MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net = &mysql->net;
NET *net;
if (!mysql)
{
set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
return 1;
}
DBUG_ENTER("cli_read_binary_rows");
net = &mysql->net;
mysql= mysql->last_used_con;
while ((pkt_len= cli_safe_read(mysql)) != packet_error)