bk commit into 4.1 tree (bar:1.2144)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2144 05/03/25 17:30:51 bar@stripped +1 -0
  mysql_client_test.c:
    Don't run GBK test if not GBK support was compiled.

  tests/mysql_client_test.c
    1.150 05/03/25 17:30:12 bar@stripped +2 -0
    Don't run GBK test if not GBK support was compiled.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.149/tests/mysql_client_test.c	2005-02-18 01:52:38 +04:00
+++ 1.150/tests/mysql_client_test.c	2005-03-25 17:30:12 +04:00
@@ -11617,6 +11617,7 @@
 
 static void test_bug8378()
 {
+#ifdef HAVE_CHARSET_gbk
   MYSQL *lmysql;
   char out[9]; /* strlen(TEST_BUG8378)*2+1 */
   int len;
@@ -11651,6 +11652,7 @@
   DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0);
 
   mysql_close(lmysql);
+#endif
 }
 
 /*