bk commit into 4.1 tree (serg:1.2471)

[serg]

Below is the list of changes that have just been committed into a local
4.1 repository of mysqldev. When mysqldev 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.2471 06/05/24 14:12:19 serg@stripped +2 -0
  Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
  into  mysql.com:/data0/mysqldev/my/mysql-4.1.20-release

  configure.in
    1.407 06/05/24 14:11:36 mysqldev@stripped +1 -2
    merged

  tests/mysql_client_test.c
    1.167 06/05/24 14:09:06 mysqldev@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:	serg
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-4.1.20-release/RESYNC

--- 1.406/configure.in	2006-04-19 15:41:49 +02:00
+++ 1.407/configure.in	2006-05-24 14:11:36 +02:00
@@ -5,7 +5,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.19)
+AM_INIT_AUTOMAKE(mysql, 4.1.20)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

--- 1.166/tests/mysql_client_test.c	2006-03-30 02:11:35 +02:00
+++ 1.167/tests/mysql_client_test.c	2006-05-24 14:09:06 +02:00
@@ -11554,25 +11554,26 @@
 static void test_bug8378()
 {
 #if defined(HAVE_CHARSET_gbk) && !defined(EMBEDDED_LIBRARY)
-  MYSQL *lmysql;
+  MYSQL *old_mysql=mysql;
   char out[9]; /* strlen(TEST_BUG8378)*2+1 */
-  int len;
+  char buf[256];
+  int len, rc;
 
   myheader("test_bug8378");
 
   if (!opt_silent)
     fprintf(stdout, "\n Establishing a test connection ...");
-  if (!(lmysql= mysql_init(NULL)))
+  if (!(mysql= mysql_init(NULL)))
   {
     myerror("mysql_init() failed");
     exit(1);
   }
-  if (mysql_options(lmysql, MYSQL_SET_CHARSET_NAME, "gbk"))
+  if (mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "gbk"))
   {
     myerror("mysql_options() failed");
     exit(1);
   }
-  if (!(mysql_real_connect(lmysql, opt_host, opt_user,
+  if (!(mysql_real_connect(mysql, opt_host, opt_user,
                            opt_password, current_db, opt_port,
                            opt_unix_socket, 0)))
   {
@@ -11582,12 +11583,18 @@
   if (!opt_silent)
     fprintf(stdout, " OK");
 
-  len= mysql_real_escape_string(lmysql, out, TEST_BUG8378_IN, 4);
+  len= mysql_real_escape_string(mysql, out, TEST_BUG8378_IN, 4);
 
   /* No escaping should have actually happened. */
   DIE_UNLESS(memcmp(out, TEST_BUG8378_OUT, len) == 0);
 
-  mysql_close(lmysql);
+  sprintf(buf, "SELECT '%s'", out);
+  rc=mysql_real_query(mysql, buf, strlen(buf));
+  myquery(rc);
+
+  mysql_close(mysql);
+
+  mysql=old_mysql;
 #endif
 }