bk commit into 5.0 tree (georg:1.1945)

[Georg Richter]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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.1945 05/07/16 09:13:31 georg@stripped +1 -0
  Merge grichter@stripped:/home/bk/mysql-5.0
  into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0

  tests/mysql_client_test.c
    1.141 05/07/16 09:13:29 georg@stripped +0 -0
    Auto merged

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql-5.0/RESYNC

--- 1.140/tests/mysql_client_test.c	2005-07-15 17:27:23 +02:00
+++ 1.141/tests/mysql_client_test.c	2005-07-16 09:13:29 +02:00
@@ -13617,12 +13617,12 @@
 static void test_client_character_set()
 {
   MY_CHARSET_INFO cs;
-  char *csname;
+  char *csname = (char*) "utf8";
+  char *csdefault = (char*)mysql_character_set_name(mysql);
   int rc;
 
   myheader("test_client_character_set");
 
-  csname= (char*) "utf8";
   rc= mysql_set_character_set(mysql, csname);
   DIE_UNLESS(rc == 0);
 
@@ -13630,7 +13630,7 @@
   DIE_UNLESS(!strcmp(cs.csname, "utf8"));
   DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci"));
   /* Restore the default character set */
-  rc= mysql_query(mysql, "set names default");
+  rc= mysql_set_character_set(mysql, csdefault);
   myquery(rc);
 }