bk commit into 6.0 tree (kostja:1.2630) BUG#36098

[konstantin]

Below is the list of changes that have just been committed into a local
6.0 repository of kostja.  When kostja 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, 2008-04-20 12:06:51+04:00, kostja@bodhi.(none) +1 -0
  Disable the auditing code in my_message_ql until Bug#36098 is fixed.
  Bug#36098 is variables.test crash on double whopper

  sql/mysqld.cc@stripped, 2008-04-20 12:06:48+04:00, kostja@bodhi.(none) +2 -0
    Disable the auditing code in my_message_ql until Bug#36098 is fixed

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-04-19 17:52:15 +04:00
+++ b/sql/mysqld.cc	2008-04-20 12:06:48 +04:00
@@ -2924,11 +2924,13 @@ void my_message_sql(uint error, const ch
     if (MyFlags & ME_FATALERROR)
       thd->is_fatal_error= 1;
 
+#ifdef BUG_36098_FIXED
     mysql_audit_general(thd,MYSQL_AUDIT_GENERAL_ERROR,error,my_time(0),
                         0,0,str,str ? strlen(str) : 0,
                         thd->query,thd->query_length,
                         thd->variables.character_set_client,
                         thd->row_count);
+#endif
 
 
     /*