bk commit into 5.1 tree (anozdrin:1.2577)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik 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@stripped, 2007-10-09 14:53:15+04:00, anozdrin@station. +3 -0
  Fix merge.

  sql/mysql_priv.h@stripped, 2007-10-09 14:53:12+04:00, anozdrin@station. +1 -0
    Fix merge.

  sql/sql_connect.cc@stripped, 2007-10-09 14:53:12+04:00, anozdrin@station. +12 -4
    Fix merge.

  sql/sql_parse.cc@stripped, 2007-10-09 14:53:13+04:00, anozdrin@station. +0 -2
    Fix merge.

diff -Nrup a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h	2007-10-09 14:29:19 +04:00
+++ b/sql/mysql_priv.h	2007-10-09 14:53:12 +04:00
@@ -965,6 +965,7 @@ void init_update_queries(void);
 void free_max_user_conn(void);
 pthread_handler_t handle_bootstrap(void *arg);
 bool mysql_execute_command(THD *thd);
+bool do_command(THD *thd);
 bool dispatch_command(enum enum_server_command command, THD *thd,
 		      char* packet, uint packet_length);
 void log_slow_statement(THD *thd);
diff -Nrup a/sql/sql_connect.cc b/sql/sql_connect.cc
--- a/sql/sql_connect.cc	2007-08-28 00:31:26 +04:00
+++ b/sql/sql_connect.cc	2007-10-09 14:53:12 +04:00
@@ -973,21 +973,29 @@ void end_connection(THD *thd)
   plugin_thdvar_cleanup(thd);
   if (thd->user_connect)
     decrease_user_connections(thd->user_connect);
+
+  if (thd->killed ||
+      net->error && net->vio != 0 && net->report_error)
+  {
+    statistic_increment(aborted_threads,&LOCK_status);
+  }
+
   if (net->error && net->vio != 0 && net->report_error)
   {
-    Security_context *sctx= thd->security_ctx;
     if (!thd->killed && thd->variables.log_warnings > 1)
+    {
+      Security_context *sctx= thd->security_ctx;
+
       sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),
                         thd->thread_id,(thd->db ? thd->db : "unconnected"),
                         sctx->user ? sctx->user : "unauthenticated",
                         sctx->host_or_ip,
                         (net->last_errno ? ER(net->last_errno) :
                          ER(ER_UNKNOWN_ERROR)));
+    }
+
     net_send_error(thd, net->last_errno, NullS);
-    statistic_increment(aborted_threads,&LOCK_status);
   }
-  else if (thd->killed)
-    statistic_increment(aborted_threads,&LOCK_status);
 }
 
 
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2007-10-09 14:32:40 +04:00
+++ b/sql/sql_parse.cc	2007-10-09 14:53:13 +04:00
@@ -86,8 +86,6 @@ const char *xa_state_names[]={
   "NON-EXISTING", "ACTIVE", "IDLE", "PREPARED"
 };
 
-static bool do_command(THD *thd);
-
 static void unlock_locked_tables(THD *thd)
 {
   if (thd->locked_tables)