bk commit into 4.1 tree (bell:1.2475)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell 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.2475 06/02/07 13:45:16 bell@stripped +2 -0
  kill.test fixed for kill on Mac OS X (which do not send OK)

  mysql-test/t/kill.test
    1.12 06/02/07 13:45:13 bell@stripped +1 -1
    This test fixed for kill on Mac OS X (which do not send OK)

  mysql-test/r/kill.result
    1.7 06/02/07 13:45:13 bell@stripped +1 -1
    This result chenged because of the correspondent test change.

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-4.1

--- 1.6/mysql-test/r/kill.result	2006-01-18 13:48:54 +02:00
+++ 1.7/mysql-test/r/kill.result	2006-02-07 13:45:13 +02:00
@@ -27,5 +27,5 @@
 ((@id := kill_id) - kill_id)
 0
 kill @id;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 drop table t1, t2, t3;

--- 1.11/mysql-test/t/kill.test	2006-01-18 13:48:54 +02:00
+++ 1.12/mysql-test/t/kill.test	2006-02-07 13:45:13 +02:00
@@ -78,7 +78,7 @@
 kill @id;
 
 connection conn1;
--- error 1053
+-- error 1053,2013
 reap;
 
 disconnect conn1;