From: Jon Olav Hauglid
Date: February 7 2011 11:49am
Subject: bzr commit into mysql-trunk branch (jon.hauglid:3603) Bug#59861
List-Archive: http://lists.mysql.com/commits/130557
X-Bug: 59861
Message-Id: <201102071149.p17BCDNB027864@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6171204419675604245=="

--===============6171204419675604245==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/x/mysql-trunk-bug59861/ based on revid:tor.didriksen@stripped

 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
=== 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 &


--===============6171204419675604245==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-trunk-bug59861/
# testament_sha1: 21f189b27a18d576ea47400d80859d523321b730
# timestamp: 2011-02-07 12:49:22 +0100
# base_revision_id: tor.didriksen@stripped\
#   2q7lj2rnb1w9fmc0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTmHCokAAaDfgAAQWHf/9/pR
hAC////wUAQsruOuPdlTNez1wZFDSDAmmaajSemmmo9TRpoaaNABKRGpmTUxk1T9FPSANDQaAA0A
ZE0Jk1MKaT9NDTSaT9EmQ00NNDTQGSnqnqBk2kAaAD1AA9QADQSiRMNE9U81NqmxT1Gj0R6QaAAD
1MrkcOfUcG0J10nTNTGPZBkR9AI4VajlXOlXKWHTxA6epfeIGtbJ6r4K/Xdu9dUmw+uwJbJHf2p/
o5vzF/q/2hli9HQen6cwk26xg3YzUotsMOkMssY7p+Bcg1IUVBSdk9OmqlkAqBCmZuIdLGC3RF1G
WCp8V7ZoHAnWYyWbq3o2ZpdzANdFTTQaODwxIQa0OaEiFQwECBUwgHloHEHyI0uiJGVXAtOxCI2Q
nFSC7ZDAQFF8WcykhgLeLNDK1SifKVWCXJuawYyCmydsyEvYnF3jc3D51ai+eSzFL7pFog1A18oS
M4EbxrLYwZk6mSgpTeLk3IshWuAtt0xNE5Caxt6YOIZl1A8s00EEi4zZTgLFVjxIiyBQ+oT7eogX
87J5jrFdLqB6NjDQ4W7Rc5oiqrFzp4cb9RVTim+k4mkTFRZXNDToQGVnbCDGZIu21HtfPK5+R4gq
QIob67GyLB2N1lVvXDfMawRWlBhIbKliJi/D5mE5m6VyXuwSAtURClIIwqAhFInuGPTGfDYXZfHu
dtgYEyaaBET02syKylIUfsCAYmQ8PlAU2lx3i2gXZ9u9EKxxezTGHRWm/VXLIsGbqQHk9pFMURO6
0EtygqL7hTv0GsX7Z4YdiU8HgIOSDQbcgvtzpL2jNYefeczUOobt/Hhi5uKoSOUyRjkG2QiVajhK
7lFxcUUEQG+XcNb9rRsPaIQAwpyGGouN7EivVt0eLRIKO97A9hasFKOWLOBJZFsk4Z1VNWqcrxhv
GuabckHNQ+JBWbMA4XFD4iu/GUnSXtEsocK6ORQFObusZ6Dl1dAqWdgoIZulkbMDqtrMjBggRr9Q
/g9W+/KQkwvYAJPjHeaQMSfMTjYB+posBejHEuLDD3g3cGLU9j/FSZ8C/mUQkQCIw7Ac04uGNmjW
D+YGmUbwwPI8xW0Q41nqDYjQwLwyHBHEEaZzyqIKkANvWi/imuxkEg4Yo68JzAPEFMzmZaxjeJP0
FSQEYirkCsovQgVeS1FHTpISgsasBlNVkMiZoEyoqKU45qwfySpugDCgAzQvJQvlnxJM5TuBCANA
fAbdGvWEhCKZbyIXFWERpPc0BGHPzO8VkSrD4ZobD0UE+d8Ba28cZiZCW81FL/27iZmmsC8W7BJ0
9RSqC8w5QgvZzwmbl4LhQylNqYUx10FrgU4irAoPGWzkU6xax6VD0OE2wdG9gcEZcw8uVlFyXHs8
VA8mx2WB4ZTWBQ0S+y2TF3Ft1VuJ741APNmmvUYyIlZForRj7gYeyKjzwElGP4CUDS8aFM0Shtsw
muJv8XckU4UJA5hwqJA=


--===============6171204419675604245==--