From: Bjorn Munch
Date: December 1 2010 10:12am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2956) Bug#58092
List-Archive: http://lists.mysql.com/commits/125630
X-Bug: 58092
Message-Id: <201012011012.oB1ACVjp003008@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1505050599=="

--===============1505050599==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 2956 Bjorn Munch	2010-12-01
      Bug #58092 Test "rpl_cross_version" has "copy_file" failing
      I am not fixing the test failure
      Adds printing of my_errno when commands fail, could hopefully help

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-17 15:05:52 +0000
+++ b/client/mysqltest.cc	2010-12-01 10:11:16 +0000
@@ -1088,8 +1088,8 @@ void handle_command_error(struct st_comm
     int i;
 
     if (command->abort_on_error)
-      die("command \"%.*s\" failed with error %d",
-          command->first_word_len, command->query, error);
+      die("command \"%.*s\" failed with error %d. my_errno=%d",
+      command->first_word_len, command->query, error, my_errno);
 
     i= match_expected_error(command, error, NULL);
 
@@ -1100,8 +1100,8 @@ void handle_command_error(struct st_comm
       DBUG_VOID_RETURN;
     }
     if (command->expected_errors.count > 0)
-      die("command \"%.*s\" failed with wrong error: %d",
-          command->first_word_len, command->query, error);
+      die("command \"%.*s\" failed with wrong error: %d. my_errno=%d",
+      command->first_word_len, command->query, error, my_errno);
   }
   else if (command->expected_errors.err[0].type == ERR_ERRNO &&
            command->expected_errors.err[0].code.errnum != 0)

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-11-17 15:05:52 +0000
+++ b/mysql-test/r/mysqltest.result	2010-12-01 10:11:16 +0000
@@ -591,7 +591,7 @@ if things work as expected
 Some data
 for cat_file command
 of mysqltest
-mysqltest: At line 1: command "cat_file" failed with error 1
+mysqltest: At line 1: command "cat_file" failed with error 1. (my_errno)
 mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists'
 mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file'
 mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file'

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-11-17 15:05:52 +0000
+++ b/mysql-test/t/mysqltest.test	2010-12-01 10:11:16 +0000
@@ -1936,6 +1936,7 @@ EOF
 cat_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
 remove_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
 
+--replace_regex /my_errno=[0-9]*/(my_errno)/
 --error 1
 --exec echo "cat_file non_existing_file;" | $MYSQL_TEST 2>&1
 


--===============1505050599==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/rcvcp-51/
# testament_sha1: b109f26a653492e892dbd44a7927a1fa7c31ea86
# timestamp: 2010-12-01 11:12:31 +0100
# base_revision_id: bjorn.munch@stripped\
#   74opxo7davkjp4xh
# 
# Begin bundle
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
i7kinChIV/2QSwA=


--===============1505050599==--