From ddb6a95abdd2578b39a3fdff907e714baa1b81e2 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Wed, 17 Mar 2010 15:25:55 +0100
Subject: Bug #43588 mysqltest command disable_abort_on_error logs connect
 commands Only log connects after --error A few small test adjustments
 needed/possible

---
 mysql-test/t/innodb_mysql.test | 4 ----
 mysql-test/t/mysqltest.test    | 1 -
 2 files changed, 5 deletions(-)

(limited to 'mysql-test/t')

diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index a3c11b8b8d6..9d68d01b79c 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -500,11 +500,7 @@ INSERT INTO t2 VALUES (),();
 CREATE OR REPLACE VIEW v1 AS SELECT 1 FROM t2 
   WHERE b =(SELECT a FROM t1 LIMIT 1);
 
---disable_query_log
---disable_result_log
 CONNECT (con1, localhost, root,,);
---enable_query_log
---enable_result_log
 CONNECTION default;
 
 DELIMITER |;
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 0c31af8b641..649a5fce366 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1441,7 +1441,6 @@ EOF
 remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
 
 # connect when "disable_abort_on_error" caused "connection not found"
---replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 --disable_abort_on_error
 connect (con1,localhost,root,,);
 connection default;
-- 
cgit v1.2.1