bk commit into 5.0 tree (konstantin:1.1925)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.1925 05/07/14 01:19:52 konstantin@stripped +1 -0
  Post-merge fixes.

  tests/mysql_client_test.c
    1.134 05/07/14 01:19:42 konstantin@stripped +6 -4
    Post-merge fixes.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.133/tests/mysql_client_test.c	2005-07-13 10:49:45 +04:00
+++ 1.134/tests/mysql_client_test.c	2005-07-14 01:19:42 +04:00
@@ -13616,7 +13616,6 @@
 
 static void test_bug10214()
 {
-  MYSQL_RES* res ;
   int   len;
   char  out[8];
 
@@ -13639,18 +13638,21 @@
 static void test_client_character_set()
 {
   MY_CHARSET_INFO cs;
-  const char *csname;
+  char *csname;
   int rc;
 
   myheader("test_client_character_set");
 
-  csname = "utf8";
-  rc = mysql_set_character_set(mysql, csname);
+  csname= (char*) "utf8";
+  rc= mysql_set_character_set(mysql, csname);
   DIE_UNLESS(rc == 0);
 
   mysql_get_character_set_info(mysql, &cs);
   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");
+  myquery(rc);
 }