bk commit into 5.0 tree (rburnett:1.2237)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of rburnett. When rburnett 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, 2006-08-14 20:48:37+02:00, rburnett@stripped +1 -0
  My previous change of replacing the call to sprintf with some memcpy type routines was not correct.  This patch reverts that.
  
  mysql_client_test.c:
    reverting my previous change

  tests/mysql_client_test.c@stripped, 2006-08-14 20:46:28+02:00, rburnett@stripped +2 -3
    reverting my previous change

# 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:	rburnett
# Host:	production.mysql.com
# Root:	/usersnfs/rburnett/mysql-5.0-kt

--- 1.198/tests/mysql_client_test.c	2006-08-14 20:48:43 +02:00
+++ 1.199/tests/mysql_client_test.c	2006-08-14 20:48:43 +02:00
@@ -12907,9 +12907,8 @@
   /* No escaping should have actually happened. */
   DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0);
 
-  strcpy(buf, "SELECT '");
-  memcpy(buf+8, out, len);
-  buf[8+len] = '\'';
+  sprintf(buf, "SELECT '%s'", out);
+  
   rc=mysql_real_query(mysql, buf, strlen(buf));
   myquery(rc);