diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-30 21:26:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-30 21:26:43 -0400 |
| commit | 648f8a178f8bb56bbfccc6c9353342d33a623380 (patch) | |
| tree | 1b6df0fc2baa65c2deb776f98cf643647e393374 /tests | |
| parent | 87e68f20677aa507fcae97ed304526e9d886f919 (diff) | |
| parent | 85281ce80fc62f6f73428466b6377706b02e5f5f (diff) | |
| download | mariadb-git-648f8a178f8bb56bbfccc6c9353342d33a623380.tar.gz | |
Manual merge.
include/config-netware.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
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; |