bk commit into 4.1 tree (andrey:1.2473) BUG#12744

[ahristov]

Below is the list of changes that have just been committed into a local
4.1 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.2473 06/02/06 15:57:31 andrey@lmy004. +1 -0
  fix the test of bug #12744  (fix for bug#12744)
  post-push fix, that fixes failure of the test on OSX.
  The problem was not in the test itself but that on OSX - SIGNAL_WITH_VIO_CLOSE
  is defined. When mysql_kill(mysql, mysql_thread_id(mysql)); is executed the
  server prematurely closes the connection so send_ok() is not send to the client
  library. The client does not see the OK packet but a connection termination so it
  returns != 0 . 

  tests/mysql_client_test.c
    1.165 06/02/06 15:57:25 andrey@lmy004. +2 -3
    fix the test of bug #12744
    post-push fix, that fixes failure of the test on OSX.
    The problem was not in the test itself but that on OSX - SIGNAL_WITH_VIO_CLOSE
    is defined. When mysql_kill(mysql, mysql_thread_id(mysql)); is executed the
    server prematurely closes the connection so send_ok() is not send to the client
    library. The client does not see the OK packet but a connection termination so it
    returns != 0 . 

# 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-4.1-bug12744

--- 1.164/tests/mysql_client_test.c	2006-02-01 20:35:11 +01:00
+++ 1.165/tests/mysql_client_test.c	2006-02-06 15:57:25 +01:00
@@ -11716,8 +11716,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))
   {
@@ -11734,7 +11733,7 @@
     fprintf(stderr, "expected error but no error occured\n");
     DIE_UNLESS(1==0);
   }
-  rc= mysql_stmt_close(prep_stmt);
+  client_connect(0);
 }
 
 /*