1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual merge.

This commit is contained in:
cmiller@zippy.cornsilk.net
2006-08-30 21:26:43 -04:00
6 changed files with 60 additions and 38 deletions

View File

@ -10444,8 +10444,8 @@ static void test_ps_i18n()
const char *stmt_text;
MYSQL_BIND bind_array[2];
const char *koi8= "<EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
const char *cp1251= "<EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
const char *koi8= "îÕ, ÚÁ ÒÙÂÁÌËÕ";
const char *cp1251= "Íó, çà ðûáàëêó";
char buf1[16], buf2[16];
ulong buf1_len, buf2_len;