List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:December 1 2010 10:12am
Subject:bzr commit into mysql-5.1-mtr branch (bjorn.munch:2956) Bug#58092
View as plain text  
#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
 


Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20101201101116-m3kf02cbt38vw9j3.bundle
Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2956) Bug#58092Bjorn Munch1 Dec