after merge

mysql-test/mysql-test-run.sh:
  tests depend on umask

3 files changed, 2 insertions, 13 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c36e9a936f1..7c5a810bf73 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -19,6 +19,8 @@ TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work
 LOCAL_SOCKET=@MYSQL_UNIX_ADDR@
 MYSQL_TCP_PORT=@MYSQL_TCP_PORT@
 
+umask 022
+
 # For query_cache test
 case `uname` in
     SCO_SV | UnixWare | OpenUNIX )
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index c390745da16..b78c677fb02 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -29,18 +29,6 @@ select ((@id := kill_id) - kill_id) from t3;
 kill @id;
 Got one of the listed errors
 drop table t1, t2, t3;
-create table t1 (id int primary key);
-create table t2 (id int unsigned not null);
-insert into t2 select id from t1;
-create table t3 (kill_id int);
-insert into t3 values(connection_id());
- select id from t1 where id in (select distinct id from t2);
-select ((@id := kill_id) - kill_id) from t3;
-((@id := kill_id) - kill_id)
-0
-kill @id;
-Got one of the listed errors
-drop table t1, t2, t3;
 select get_lock("a", 10);
 get_lock("a", 10)
 1
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index eaeb174248b..f8ba649b3eb 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -47,7 +47,6 @@ connection con2;
 select 4;
 drop table t1;
 connection default;
-disconnect con2;
 
 --error 1064
 kill (select count(*) from mysql.user);