diff options
| author | unknown <kostja@bodhi.(none)> | 2007-11-22 03:48:51 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-11-22 03:48:51 +0300 |
| commit | add444a4a3acae1e038a3dd9f8dbe1e4ec6d549e (patch) | |
| tree | 800760b9dce3a5a8c287372b5024783c82fe4165 | |
| parent | 569c2dcd12735d249e3fc6b7eb41d61c4b565432 (diff) | |
| download | mariadb-git-add444a4a3acae1e038a3dd9f8dbe1e4ec6d549e.tar.gz | |
Update the failing kill test in the team tree.
mysql-test/r/kill.result:
Update the broken result (kill.test fails in the team tree).
mysql-test/t/kill.test:
Fix the broken test (team tree)
| -rw-r--r-- | mysql-test/r/kill.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/kill.test | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 8376eb7c0de..3ea5bbd20bc 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -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 --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index 219412e5afa..3da4232502d 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -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; |