bk commit into 5.1 tree (monty:1.2414)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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-01-30 13:52:26+02:00, monty@stripped +4 -0
  Fixed problems detected by pushbuild

  mysql-test/t/log_state.test@stripped, 2007-01-30 13:52:23+02:00, monty@stripped +5 -1
    Move disconnect last to avoid sporadic failures in test because 'Quit' command appeared in general log

  plugin/daemon_example/daemon_example.c@stripped, 2007-01-30 13:52:23+02:00, monty@stripped +3 -3
    Define __attribute__ to fix compiler error with not gcc compilers

  sql-common/client.c@stripped, 2007-01-30 13:52:23+02:00, monty@stripped +1 -1
    Fixed spelling error

  sql/sql_parse.cc@stripped, 2007-01-30 13:52:23+02:00, monty@stripped +5 -1
    Added comment

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.621/sql/sql_parse.cc	2007-01-29 01:51:39 +02:00
+++ 1.622/sql/sql_parse.cc	2007-01-30 13:52:23 +02:00
@@ -413,7 +413,11 @@
         }
       }
 
-      /* Why logging is performed before all checks've passed? */
+      /*
+        Log the command before authentication checks, so that the user can
+        check the log for the tried login tried and also to detect
+        break-in attempts.
+      */
       general_log_print(thd, command,
                         (thd->main_security_ctx.priv_user ==
                          thd->main_security_ctx.user ?

--- 1.3/plugin/daemon_example/daemon_example.c	2007-01-29 16:13:14 +02:00
+++ 1.4/plugin/daemon_example/daemon_example.c	2007-01-30 13:52:23 +02:00
@@ -19,11 +19,11 @@
 #include <mysql/plugin.h>
 
 /*
-#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
+  Disable __attribute__() on non-gcc compilers.
+*/
+#if !defined(__attribute__) && !defined(__GNUC__)
 #define __attribute__(A)
 #endif
-*/
-
 
 
 /*

--- 1.3/mysql-test/t/log_state.test	2006-07-04 23:37:28 +03:00
+++ 1.4/mysql-test/t/log_state.test	2007-01-30 13:52:23 +02:00
@@ -37,7 +37,6 @@
 select sleep(2);
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
 select * from mysql.slow_log;
-disconnect con1;
 connection default;
 show global variables
 where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
@@ -121,3 +120,8 @@
 select * from mysql.general_log;
 
 --enable_ps_protocol
+
+#
+# Cleanup (must be done last to avoid delayed 'Quit' message in general log)
+#
+disconnect con1;

--- 1.123/sql-common/client.c	2007-01-24 19:57:01 +02:00
+++ 1.124/sql-common/client.c	2007-01-30 13:52:23 +02:00
@@ -682,7 +682,7 @@
   mysql->info=0;
   mysql->affected_rows= ~(my_ulonglong) 0;
   /*
-    We don't want to clear the protocol buffer on COM_QUIT, beacsue if
+    We don't want to clear the protocol buffer on COM_QUIT, because if
     the previous command was a shutdown command, we may have the
     response for the COM_QUIT already in the communication buffer
   */