bk commit into 5.1 tree (kostja:1.2620)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-11-22 03:48:51+03:00, kostja@bodhi.(none) +2 -0
  Update the failing kill test in the team tree.

  mysql-test/r/kill.result@stripped, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Update the broken result (kill.test fails in the team tree).

  mysql-test/t/kill.test@stripped, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Fix the broken test (team tree)

diff -Nrup a/mysql-test/r/kill.result b/mysql-test/r/kill.result
--- a/mysql-test/r/kill.result	2007-11-15 15:35:32 +03:00
+++ b/mysql-test/r/kill.result	2007-11-22 03:48:48 +03:00
@@ -132,5 +132,7 @@ EXECUTE stmt;
 
 # Connection: con2.
 KILL CONNECTION_ID();
+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR, depending on the timing 
+# of close of the connection socket
 SELECT 1;
-ERROR HY000: Lost connection to MySQL server during query
+Got one of the listed errors
diff -Nrup a/mysql-test/t/kill.test b/mysql-test/t/kill.test
--- a/mysql-test/t/kill.test	2007-11-15 15:35:32 +03:00
+++ b/mysql-test/t/kill.test	2007-11-22 03:48:48 +03:00
@@ -318,5 +318,7 @@ while ($i)
 
 KILL CONNECTION_ID();
 
---error 2013
+--echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR, depending on the timing 
+--echo # of close of the connection socket
+--error 2013, 2006 
 SELECT 1;