bzr commit into mysql-5.5 branch (jon.hauglid:3300) Bug#59861

[Jon Olav Hauglid]

#At file:///export/home/x/mysql-5.5-bug59861/ based on revid:georgi.kodinov@stripped

 3300 Jon Olav Hauglid	2011-02-03
      Bug #59861 why does log_slow_statement call thd_proc_info twice?
      
      This patch removes an extraneous
        thd_proc_info(thd, "logging slow query")
      call from low_slow_statement(). The removed call was from
      before it was decided to actually log the query to the slow log.
      
      No test case added.

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-01-26 07:35:18 +0000
+++ b/sql/sql_parse.cc	2011-02-03 09:02:03 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1448,7 +1448,6 @@ void log_slow_statement(THD *thd)
   if (thd->enable_slow_log)
   {
     ulonglong end_utime_of_query= thd->current_utime();
-    thd_proc_info(thd, "logging slow query");
 
     if (((thd->server_status & SERVER_QUERY_WAS_SLOW) ||
          ((thd->server_status &


Attachment: [text/bzr-bundle] bzr/[e-mail]