From: Date: April 13 2005 2:46pm
Subject: bk commit into 5.0 tree (msvensson:1.1820) BUG#9455
List-Archive: http://lists.mysql.com/internals/23960
X-Bug: 9455
Message-Id: <20050413124642.6370625DF4B@blaudden.homeip.net>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1820 05/04/13 14:46:37 msvensson@neptunus.(none) +1 -0
  BUG#9455 mysqladmin status crash the server
   - Send last error to client before closing down the connection

  sql/sql_parse.cc
    1.441 05/04/13 14:46:33 msvensson@neptunus.(none) +2 -2
    Check net->last_errno to see if error should be sent to client before closing the connection

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug9454

--- 1.440/sql/sql_parse.cc	2005-04-12 23:12:14 +02:00
+++ 1.441/sql/sql_parse.cc	2005-04-13 14:46:33 +02:00
@@ -1070,8 +1070,8 @@
 
     if ((error=check_connection(thd)))
     {						// Wrong permissions
-      if (error > 0)
-	net_printf_error(thd, error, thd->host_or_ip);
+      if (net->last_errno > 0)
+	net_printf_error(thd, net->last_errno, thd->host_or_ip);
 #ifdef __NT__
       if (vio_type(net->vio) == VIO_TYPE_NAMEDPIPE)
 	my_sleep(1000);				/* must wait after eof() */