1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #42496 - the server could crash on a debug assert after a failure

Browse Source 
to write into a closed socket
This commit is contained in:
Dmitry Shulga 2010-07-21 14:56:43 +07:00
parent 48a74d7472
commit 49d327ebf7
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/protocol.cc
View File

@ -534,7 +534,11 @@ void Protocol::end_partial_result_set(THD *thd_arg)
bool Protocol::flush() bool Protocol::flush()
{ {
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
return net_flush(&thd->net); bool error;
thd->main_da.can_overwrite_status= TRUE;
error= net_flush(&thd->net);
thd->main_da.can_overwrite_status= FALSE;
return error;
#else #else
return 0; return 0;
#endif #endif
@ -574,7 +578,8 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
if (flags & SEND_NUM_ROWS) if (flags & SEND_NUM_ROWS)
{ // Packet with number of elements { // Packet with number of elements
uchar *pos= net_store_length(buff, list->elements); uchar *pos= net_store_length(buff, list->elements);
(void) my_net_write(&thd->net, buff, (size_t) (pos-buff)); if (my_net_write(&thd->net, buff, (size_t) (pos-buff)))
DBUG_RETURN(1);
} }
#ifndef DBUG_OFF #ifndef DBUG_OFF
@ -698,7 +703,7 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
if (flags & SEND_DEFAULTS) if (flags & SEND_DEFAULTS)
item->send(&prot, &tmp); // Send default value item->send(&prot, &tmp); // Send default value
if (prot.write()) if (prot.write())
break; /* purecov: inspected */ DBUG_RETURN(1);
#ifndef DBUG_OFF #ifndef DBUG_OFF
field_types[count++]= field.type; field_types[count++]= field.type;
#endif #endif
@ -711,7 +716,9 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
to show that there is no cursor. to show that there is no cursor.
Send no warning information, as it will be sent at statement end. Send no warning information, as it will be sent at statement end.
*/ */
write_eof_packet(thd, &thd->net, thd->server_status, thd->total_warn_count); if (write_eof_packet(thd, &thd->net, thd->server_status,
thd->total_warn_count))
DBUG_RETURN(1);
} }
DBUG_RETURN(prepare_for_send(list)); DBUG_RETURN(prepare_for_send(list));

3
sql/sql_cache.cc
View File

@ -1653,7 +1653,8 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
thd->limit_found_rows = query->found_rows(); thd->limit_found_rows = query->found_rows();
thd->status_var.last_query_cost= 0.0; thd->status_var.last_query_cost= 0.0;
thd->main_da.disable_status(); if (!thd->main_da.is_set())
thd->main_da.disable_status();
BLOCK_UNLOCK_RD(query_block); BLOCK_UNLOCK_RD(query_block);
DBUG_RETURN(1); // Result sent to client DBUG_RETURN(1); // Result sent to client

7
sql/sql_cursor.cc
View File

@ -658,7 +658,12 @@ void Materialized_cursor::fetch(ulong num_rows)
if ((res= table->file->rnd_next(table->record[0]))) if ((res= table->file->rnd_next(table->record[0])))
break; break;
/* Send data only if the read was successful. */ /* 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) { switch (res) {

7
sql/sql_prepare.cc
View File

@ -263,8 +263,11 @@ static bool send_prep_stmt(Prepared_statement *stmt, uint columns)
&stmt->lex->param_list, &stmt->lex->param_list,
Protocol::SEND_EOF); Protocol::SEND_EOF);
} }
/* Flag that a response has already been sent */
thd->main_da.disable_status(); if (!error)
/* Flag that a response has already been sent */
thd->main_da.disable_status();
DBUG_RETURN(error); DBUG_RETURN(error);
} }
#else #else