From 49d327ebf763dca23969ac4afe814617815d1411 Mon Sep 17 00:00:00 2001
From: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
Date: Wed, 21 Jul 2010 14:56:43 +0700
Subject: Fixed bug #42496 - the server could crash on a debug assert after a
 failure to write into a closed socket

---
 sql/sql_cursor.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'sql/sql_cursor.cc')

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) {
-- 
cgit v1.2.1