From: Date: July 27 2005 12:45pm
Subject: bk commit into 5.0 tree (georg:1.1891) BUG#9968
List-Archive: http://lists.mysql.com/internals/27630
X-Bug: 9968
Message-Id: <20050727104551.25ADC16D08D@lmy002.wdf.sap.corp>

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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
  1.1891 05/07/27 12:45:32 georg@stripped +1 -0
  fix for bug#9968 (slow query log contains useless entries)
  
  Query has to be written to the log before calling
  thd->set_statement(&stmt_backup), otherwise query will be empty.
  Setting thd->enabe_slow_log to FALSE prevents that dispatch_command
  logs the (empty) query again.

  sql/sql_prepare.cc
    1.143 05/07/27 12:45:23 georg@stripped +4 -0
    fix for bug#9968 (slow query log contains useless entries)
    
    Query has to be written to the log before calling
    thd->set_statement(&stmt_backup), otherwise query will be empty.
    Setting thd->enabe_slow_log to FALSE prevents that dispatch_command
    logs the (empty) query again.

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0

--- 1.142/sql/sql_prepare.cc	2005-07-20 01:33:19 +02:00
+++ 1.143/sql/sql_prepare.cc	2005-07-27 12:45:23 +02:00
@@ -2079,6 +2079,10 @@
     reset_stmt_params(stmt);
   }
 
+  log_slow_statement(thd);
+  /* Prevent from second logging in the end of dispatch_command */
+  thd->enable_slow_log= FALSE;
+
   thd->set_statement(&stmt_backup);
   thd->lock_id= &thd->main_lock_id;
   thd->current_arena= thd;