diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-17 15:25:55 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-17 15:25:55 +0100 |
| commit | ddb6a95abdd2578b39a3fdff907e714baa1b81e2 (patch) | |
| tree | bd6084f3b7b22a53592413dfa611d986b5f37bed | |
| parent | eb235387ae623507ca8a3549b3c433b47ad357d3 (diff) | |
| download | mariadb-git-ddb6a95abdd2578b39a3fdff907e714baa1b81e2.tar.gz | |
Bug #43588 mysqltest command disable_abort_on_error logs connect commands
Only log connects after --error
A few small test adjustments needed/possible
| -rw-r--r-- | client/mysqltest.cc | 2 | ||||
| -rw-r--r-- | mysql-test/r/mysqltest.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 64cf06736a0..18af4088e68 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4920,7 +4920,7 @@ int connect_n_handle_errors(struct st_command *command, ds= &ds_res; /* Only log if an error is expected */ - if (!command->abort_on_error && + if (command->expected_errors.count > 0 && !disable_query_log) { /* diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 38112c032b5..de7a3eefb6a 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -447,7 +447,6 @@ OK mysqltest: The test didn't produce any output mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists -connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET); show tables; ERROR 3D000: No database selected Output from mysqltest-x.inc 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; |