summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-08-30 21:26:43 -0400
committercmiller@zippy.cornsilk.net <>2006-08-30 21:26:43 -0400
commitd575196c35a1074af007a1d0b0948dc357dfdc57 (patch)
tree1b6df0fc2baa65c2deb776f98cf643647e393374 /tests
parent0f0256818e2c30be40dd44bcaf2cf1fda2223a43 (diff)
parentf864c06e509096db54d27bd454a8674e7de69fa5 (diff)
downloadmariadb-git-d575196c35a1074af007a1d0b0948dc357dfdc57.tar.gz
Manual merge.
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index f36103df11c..5c697312db4 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -10444,8 +10444,8 @@ static void test_ps_i18n()
const char *stmt_text;
MYSQL_BIND bind_array[2];
- const char *koi8= ", ";
- const char *cp1251= ", ";
+ const char *koi8= "îÕ, ÚÁ ÒÙÂÁÌËÕ";
+ const char *cp1251= "Íó, çà ðûáàëêó";
char buf1[16], buf2[16];
ulong buf1_len, buf2_len;