List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:August 31 2006 3:29pm
Subject:bk commit into 5.1 tree (cmiller:1.2289)
View as plain text  
Below is the list of changes that have just been committed into a local
5.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:28:57-04:00, cmiller@stripped +1 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals
  MERGE: 1.1810.1697.132

  tests/mysql_client_test.c@stripped, 2006-08-31 11:28:53-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.167.1.39

# 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/my51-no-strange-literals/RESYNC

--- 1.208/tests/mysql_client_test.c	2006-08-31 11:29:02 -04:00
+++ 1.209/tests/mysql_client_test.c	2006-08-31 11:29:02 -04:00
@@ -10444,8 +10444,9 @@
   const char *stmt_text;
   MYSQL_BIND bind_array[2];
 
+  /* 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;
 
Thread
bk commit into 5.1 tree (cmiller:1.2289)Chad MILLER31 Aug