diff options
| author | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-07-21 14:56:43 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@Sun.COM> | 2010-07-21 14:56:43 +0700 |
| commit | bd41af86ebc53510760504b980f073be4438f6e9 (patch) | |
| tree | 6fa561732c7d7b6aafd747e41417467da3cab2c9 /sql/sql_cursor.cc | |
| parent | 7ccbf9b817b47d0393fe66bda6f6013ec24486ba (diff) | |
| download | mariadb-git-bd41af86ebc53510760504b980f073be4438f6e9.tar.gz | |
Fixed bug #42496 - the server could crash on a debug assert after a failure
to write into a closed socket
sql/protocol.cc:
Protocol::flush modified: set thd->main_da.can_overwrite_status= TRUE
before call to net_flush() in order to prevent crash on assert in case
of socket write failure, reset it to FALSE when net_flush() returned;
Protocol::send_fields modified: return from method with error if call to
my_net_write(), proto.write() or write_eof_packet() failed.
sql/sql_cache.cc:
Query_cache::send_result_to_client modified: call to
thd->main_da.disable_status() only if write to socket
was successful.
sql/sql_cursor.cc:
Materialized_cursor::fetch modified: leave method if call to
result->send_data() failed.
sql/sql_prepare.cc:
send_prep_stmt() modified: call to thd->main_da.disable_status()
only if thd->protocol_text.send_fields() completed successfully.
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 6f61dc40f66..d7d029d28d4 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -658,7 +658,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) { |