From: Alexander Nozdrin
Date: October 21 2009 2:10pm
Subject: bzr push into mysql-5.5.0-next-mr-bugfixing branch (alik:2906 to 2908)
 WL#4098
List-Archive: http://lists.mysql.com/commits/87658
Message-Id: <20091021141047.EB4187FC74@quad>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_jzRrgx5TQIJk3Dew9aL2Yg)"

--Boundary_(ID_jzRrgx5TQIJk3Dew9aL2Yg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 2908 Alexander Nozdrin	2009-10-21
      Backport WL#4098 from 6.0.
      
      The value was changed from 1024 to 2048,
      because 1024 is already used.
      
      Original revision:
      ------------------------------------------------------------
      revno: 2476.657.259
      committer: tsmith@stripped
      timestamp: Tue 2008-01-29 19:32:44 +0100
      message:
        WL#4098: Add a status flag for slow queries
        
        Add new result set status flag SERVER_QUERY_WAS_SLOW in mysql_com.h.
        
        There is no server-side implementation to actually set this flag at this
        time.  This patch simply defines the interface so that applications can
        make use of it.  See the worklog for background.
      ------------------------------------------------------------

    modified:
      include/mysql_com.h
 2907 Alexander Nozdrin	2009-10-21
      Backporting WL#3953 from 6.0. Original revision:
      ------------------------------------------------------------
      revno: 2476.714.9
      committer: markleith@stripped
      timestamp: Mon 2007-09-03 23:18:50 +0100
      message:
        Bug#25822 / WL#3953 - Log Access Denied errors for bad passwords in the error log
        
        Added logging of Access Denied messages on failed new connections to the 
        error log when log-warnings = 2.
        
        This allows a user to log these messages without having to incur the overhead
        of using the general query log on production systems.
      ------------------------------------------------------------

    modified:
      sql/sql_connect.cc
 2906 Evgeny Potemkin	2009-10-20 [merge]
      Auto-merged fix for the bug#41760.

    modified:
      mysql-test/r/delayed.result
      mysql-test/r/insert.result
      mysql-test/t/delayed.test
      mysql-test/t/insert.test
      sql/sql_insert.cc
=== modified file 'include/mysql_com.h'
--- a/include/mysql_com.h	2008-05-20 16:36:26 +0000
+++ b/include/mysql_com.h	2009-10-21 14:10:19 +0000
@@ -203,6 +203,7 @@ enum enum_server_command
   number of result set columns.
 */
 #define SERVER_STATUS_METADATA_CHANGED 1024
+#define SERVER_QUERY_WAS_SLOW          2048
 
 /**
   Server status flags that must be cleared when starting

=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc	2009-09-30 20:10:22 +0000
+++ b/sql/sql_connect.cc	2009-10-21 14:00:58 +0000
@@ -486,6 +486,18 @@ check_user(THD *thd, enum enum_server_co
                     thd->main_security_ctx.user,
                     thd->main_security_ctx.host_or_ip,
                     passwd_len ? ER(ER_YES) : ER(ER_NO));
+  /*
+    log access denied messages to the error log when log-warnings = 2
+    so that the overhead of the general query log is not required to track
+    failed connections
+  */
+  if (global_system_variables.log_warnings > 1)
+  {
+    sql_print_warning(ER(ER_ACCESS_DENIED_ERROR),
+                      thd->main_security_ctx.user,
+                      thd->main_security_ctx.host_or_ip,
+                      passwd_len ? ER(ER_YES) : ER(ER_NO));
+  }
   DBUG_RETURN(1);
 #endif /* NO_EMBEDDED_ACCESS_CHECKS */
 }


--Boundary_(ID_jzRrgx5TQIJk3Dew9aL2Yg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alik@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alik@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alik@stripped
# target_branch: file:///mnt/raid/alik/MySQL/bzr/backporting/mysql-\
#   next-mr-bugfixing/
# testament_sha1: 2a37449002f84f7c3d7f2a7d84266cbb84f7a058
# timestamp: 2009-10-21 18:10:47 +0400
# source_branch: file:///mnt/raid/alik/MySQL/bzr/mysql-6.0-codebase/
# base_revision_id: epotemkin@stripped\
#   kmwrtl2zl61v4zys
# 
# Begin bundle
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
Arh5ruLV4kDgawzicvE7XT/F3JFOFCQ5NX3qQA==


--Boundary_(ID_jzRrgx5TQIJk3Dew9aL2Yg)--