bk commit into 5.0 tree (andrey:1.2032)

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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.2032 06/02/10 14:42:08 andrey@lmy004. +1 -0
  fix test of bug 12744 on OSX

  tests/mysql_client_test.c
    1.173 06/02/10 14:42:00 andrey@lmy004. +2 -2
    fix test of bug 12744 on OSX

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.0-clean

--- 1.172/tests/mysql_client_test.c	2006-02-02 22:07:27 +01:00
+++ 1.173/tests/mysql_client_test.c	2006-02-10 14:42:00 +01:00
@@ -14708,8 +14708,7 @@
   rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8);
   DIE_UNLESS(rc==0);
 
-  rc= mysql_kill(mysql, mysql_thread_id(mysql));
-  DIE_UNLESS(rc==0);
+  mysql_close(mysql);
 
   if (rc= mysql_stmt_execute(prep_stmt))
   {
@@ -14727,6 +14726,7 @@
     DIE_UNLESS(1==0);
   }
   rc= mysql_stmt_close(prep_stmt);
+  client_connect(0);
 }
 
 /* Bug #16144: mysql_stmt_attr_get type error */