bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2903) Bug#43588

[Bjorn Munch]

#At file:///home/bm136801/my/memvar-51/ based on revid:bjorn.munch@stripped

 2903 Bjorn Munch	2010-03-17
      Bug #43588 mysqltest command disable_abort_on_error logs connect commands
      Only log connects after --error
      A few small test adjustments needed/possible

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/innodb_mysql.test
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-03-04 11:10:36 +0000
+++ b/client/mysqltest.cc	2010-03-17 14:25:55 +0000
@@ -4920,7 +4920,7 @@ int connect_n_handle_errors(struct st_co
   ds= &ds_res;
 
   /* Only log if an error is expected */
-  if (!command->abort_on_error &&
+  if (command->expected_errors.count > 0 &&
       !disable_query_log)
   {
     /*

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-03-02 11:39:32 +0000
+++ b/mysql-test/r/mysqltest.result	2010-03-17 14:25:55 +0000
@@ -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

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2010-02-26 11:17:00 +0000
+++ b/mysql-test/t/innodb_mysql.test	2010-03-17 14:25:55 +0000
@@ -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 |;

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-03-03 10:17:00 +0000
+++ b/mysql-test/t/mysqltest.test	2010-03-17 14:25:55 +0000
@@ -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;


Attachment: [text/bzr-bundle] bzr/[e-mail]