bk commit into 4.1 tree (cmiller:1.2538)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
4.1 repository of cmiller. When cmiller 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-31 11:14:04-04:00, cmiller@stripped +1 -0
  Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
  single file is a bad practice.  

  tests/mysql_client_test.c@stripped, 2006-08-31 11:14:03-04:00, cmiller@stripped
+3 -2
    Replace literal characters which don't make sense in UTF8 with ubiquitously-
    understood numbers.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals

--- 1.168/tests/mysql_client_test.c	2006-08-31 11:14:07 -04:00
+++ 1.169/tests/mysql_client_test.c	2006-08-31 11:14:07 -04:00
@@ -9952,8 +9952,9 @@
   const char *stmt_text;
   MYSQL_BIND bind_array[2];
 
-  const char *koi8= "îÕ, ÚÁ ÒÙÂÁÌËÕ";
-  const char *cp1251= "Íó, çà ðûáàëêó";
+  /* Represented as numbers to keep UTF8 tools from clobbering them. */
+  const char *koi8= "\xee\xd5\x2c\x20\xda\xc1\x20\xd2\xd9\xc2\xc1\xcc\xcb\xd5";
+  const char *cp1251= "\xcd\xf3\x2c\x20\xe7\xe0\x20\xf0\xfb\xe1\xe0\xeb\xea\xf3";
   char buf1[16], buf2[16];
   ulong buf1_len, buf2_len;