Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Manual merge/

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 10c59d6a374..91eaadb0d9f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -86,6 +86,7 @@ const char *xa_state_names[]={
   "NON-EXISTING", "ACTIVE", "IDLE", "PREPARED"
 };
 
+static bool do_command(THD *thd);
 
 static void unlock_locked_tables(THD *thd)
 {
@@ -681,12 +682,12 @@ bool do_command(THD *thd)
     DBUG_PRINT("info",("Got error %d reading command from socket %s",
 		       net->error,
 		       vio_description(net->vio)));
+
     /* Check if we can continue without closing the connection */
+
     if (net->error != 3)
-    {
-      statistic_increment(aborted_threads,&LOCK_status);
       DBUG_RETURN(TRUE);			// We have to close it.
-    }
+
     net_send_error(thd, net->last_errno, NullS);
     net->error= 0;
     DBUG_RETURN(FALSE);