bk commit into 4.1 tree (konstantin:1.2215)

[konstantin]

Below is the list of changes that have just been committed into a local
4.1 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2215 05/01/13 02:13:19 konstantin@stripped +2 -0
  Add logging of COM_EXECUTE in the general query log.

  sql/sql_prepare.cc
    1.143 05/01/13 02:13:13 konstantin@stripped +4 -1
    Add logging of COM_EXECUTE in the general query log.

  sql/sql_parse.cc
    1.417 05/01/13 02:13:13 konstantin@stripped +1 -1
    A shorter name for COM_EXECUTE command.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/home/kostja/work/mysql-4.1-root

--- 1.416/sql/sql_parse.cc	2005-01-12 19:00:03 +03:00
+++ 1.417/sql/sql_parse.cc	2005-01-13 02:13:13 +03:00
@@ -64,7 +64,7 @@
   "Drop DB", "Refresh", "Shutdown", "Statistics", "Processlist",
   "Connect","Kill","Debug","Ping","Time","Delayed insert","Change user",
   "Binlog Dump","Table Dump",  "Connect Out", "Register Slave",
-  "Prepare", "Prepare Execute", "Long Data", "Close stmt",
+  "Prepare", "Execute", "Long Data", "Close stmt",
   "Reset stmt", "Set option",
   "Error"					// Last command number
 };

--- 1.142/sql/sql_prepare.cc	2004-12-25 01:30:26 +03:00
+++ 1.143/sql/sql_prepare.cc	2005-01-13 02:13:13 +03:00
@@ -1592,7 +1592,7 @@
     DBUG_RETURN(1);
   }
 
-  mysql_log.write(thd, COM_PREPARE, "%s", packet);
+  mysql_log.write(thd, COM_PREPARE, "[%lu] %s", stmt->id, packet);
 
   thd->current_arena= stmt;
   mysql_init_query(thd, (uchar *) thd->query, thd->query_length);
@@ -1792,6 +1792,9 @@
   if (stmt->param_count && stmt->set_params_data(stmt,
&expanded_query))
     goto set_params_data_err;
 #endif
+  mysql_log.write(thd, COM_EXECUTE, "[%lu] %s", stmt->id,
+                  expanded_query.length() ? expanded_query.c_ptr() :
+                                            stmt->query);
   thd->protocol= &thd->protocol_prep;           // Switch to binary protocol
   execute_stmt(thd, stmt, &expanded_query, TRUE);
   thd->protocol= &thd->protocol_simple;         // Use normal protocol