Commit 942af8b6 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
parents 7bc5fd19 9e4d75d1

tests/mysql_client_test.c

+3 −2
Original line number Diff line number Diff line
@@ -10444,8 +10444,9 @@ static void test_ps_i18n() 
  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;