bzr push into mysql-trunk branch (jon.hauglid:3602 to 3603) Bug#59861

[Jon Olav Hauglid]

 3603 Jon Olav Hauglid	2011-02-07
      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
 3602 Tor Didriksen	2011-02-07 [merge]
      Merge Bug #59632 from 5.5, add unit test

    added:
      mysql-test/r/ssl_and_innodb.result
      mysql-test/t/ssl_and_innodb.test
    modified:
      sql/item_strfunc.h
      unittest/gunit/item-t.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-01-26 07:37:18 +0000
+++ b/sql/sql_parse.cc	2011-02-07 11:49:18 +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
@@ -1491,7 +1491,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 &

No bundle (reason: useless for push emails).