diff options
author | cmiller@zippy.cornsilk.net <> | 2006-08-31 11:34:17 -0400 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2006-08-31 11:34:17 -0400 |
commit | 8fbf3c5e8dcbfcaa1ce967e8f27d139a31da447c (patch) | |
tree | e7ba957217cfa0e1ee14819a7a075eb62ad44c51 /tests | |
parent | 31df5d1d0dbcfb12107541c78d1dabfcbb44e9ab (diff) | |
parent | bd0451e23222b538159aad158ad2d9d0bacdd5f7 (diff) | |
download | mariadb-git-8fbf3c5e8dcbfcaa1ce967e8f27d139a31da447c.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Fixes bad merge.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 5c697312db4..cd9ac675c25 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -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; |