diff options
| author | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 17:35:37 +0400 |
|---|---|---|
| committer | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-25 17:35:37 +0400 |
| commit | 34b7d36ca9724c6ebda3b6aaab5c0e8bcc9b2a9f (patch) | |
| tree | 5b53cbb61a979924bcd464da1da6f3f94de1c735 /tests | |
| parent | acb166e35aa0f3366b57168d1960c448029542fc (diff) | |
| parent | e4c529d9b5867e04a5f931f6f436e5af90c33704 (diff) | |
| download | mariadb-git-34b7d36ca9724c6ebda3b6aaab5c0e8bcc9b2a9f.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 721ec81e19c..0f117b640c3 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -12704,6 +12704,7 @@ from t2);"); static void test_bug8378() { +#ifdef HAVE_CHARSET_gbk MYSQL *lmysql; char out[9]; /* strlen(TEST_BUG8378)*2+1 */ int len; @@ -12738,6 +12739,7 @@ static void test_bug8378() DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0); mysql_close(lmysql); +#endif } |