bk commit into 5.0 tree (konstantin:1.1764)

[konstantin]

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

ChangeSet
  1.1764 05/01/13 02:19:35 konstantin@stripped +3 -0
  Manual merge.

  sql/sql_prepare.cc
    1.97 05/01/13 02:19:30 konstantin@stripped +4 -3
    Manual merge.

  sql/sql_parse.cc
    1.392 05/01/13 02:18:12 konstantin@stripped +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.50 05/01/13 02:18:12 konstantin@stripped +0 -0
    Auto merged

# 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-5.0-root/RESYNC

--- 1.49/sql/sql_analyse.cc	2005-01-12 18:59:54 +03:00
+++ 1.50/sql/sql_analyse.cc	2005-01-13 02:18:12 +03:00
@@ -1029,19 +1029,18 @@
 } /* check_ulonlong */
 
 
-
 /*
-  FUNCTION: append_escaped()
- 
+  Quote special characters in a string.
+
+  SYNOPSIS
+   append_escaped(to_str, from_str)
+   to_str (in) A pointer to a String.
+   from_str (to) A pointer to an allocated string
+
   DESCRIPTION
     append_escaped() takes a String type variable, where it appends
     escaped the second argument. Only characters that require escaping
     will be escaped.
-
-  ARGUMENTS
-    A pointer to a String variable, where results will be appended
-    A pointer to a String variable, which is appended to the result
-    String, escaping those characters that require it.
 
   RETURN VALUES
     0 Success

--- 1.391/sql/sql_parse.cc	2005-01-12 21:50:59 +03:00
+++ 1.392/sql/sql_parse.cc	2005-01-13 02:18:12 +03:00
@@ -77,7 +77,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", "Fetch",
   "Error"					// Last command number
 };

--- 1.96/sql/sql_prepare.cc	2005-01-06 18:00:57 +03:00
+++ 1.97/sql/sql_prepare.cc	2005-01-13 02:19:30 +03:00
@@ -1740,7 +1740,7 @@
     DBUG_RETURN(TRUE);
   }
 
-  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);
@@ -1989,6 +1989,10 @@
     my_error(ER_OUTOFMEMORY, 0, expanded_query.length());
     goto err;
   }
+
+  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
   if (!(specialflag & SPECIAL_NO_PRIOR))