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

Auto-merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-07-29 16:32:11 +04:00
parent 14b769cfc6 c33caca3a4
commit dfc63866eb
68 changed files with 618 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_cursor.cc
View File

@ -306,7 +306,12 @@ void Materialized_cursor::fetch(ulong num_rows)
if ((res= table->file->rnd_next(table->record[0])))
break;
/* Send data only if the read was successful. */
result->send_data(item_list);
/*
If network write failed (i.e. due to a closed socked),
the error has already been set. Just return.
*/
if (result->send_data(item_list))
return;
}
switch (res) {