bk commit into 5.0 tree (msvensson:1.2106)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2106 06/03/23 21:48:31 msvensson@shellback.(none) +2 -0
  Dump result to .log file at test failure

  mysql-test/lib/mtr_report.pl
    1.21 06/03/23 21:48:27 msvensson@shellback.(none) +9 -1
    Inform about the <testname>.log file's existence

  client/mysqltest.c
    1.230 06/03/23 21:48:26 msvensson@shellback.(none) +9 -2
    Dump accumulated result upuntil test failure into a <testname>.log file for
later examination

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.20/mysql-test/lib/mtr_report.pl	2006-03-07 19:44:53 +01:00
+++ 1.21/mysql-test/lib/mtr_report.pl	2006-03-23 21:48:27 +01:00
@@ -36,6 +36,7 @@
 
   my $reject_file=  "r/$tname.reject";
   my $result_file=  "r/$tname.result";
+  my $log_file=  "r/$tname.log";
   my $eval_file=    "r/$tname.eval";
 
   if ( $::opt_suite ne "main" )
@@ -43,10 +44,11 @@
     $reject_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$reject_file";
     $result_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$result_file";
     $eval_file=   "$::glob_mysql_test_dir/suite/$::opt_suite/$eval_file";
+    $log_file=   "$::glob_mysql_test_dir/suite/$::opt_suite/$log_file";
   }
 
   if ( -f $eval_file )
-  { 
+  {
     $result_file=  $eval_file;
   }
   elsif ( $::opt_result_ext and
@@ -69,6 +71,12 @@
     print "Please follow the instructions outlined at\n";
     print "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html\n";
     print "to find the reason to this problem and how to report this.\n\n";
+  }
+
+  if ( -f $log_file )
+  {
+    print "Result from queries before failure can be found in $log_file\n";
+    # FIXME Maybe a tail -f -n 10 $log_file here
   }
 }
 

--- 1.229/client/mysqltest.c	2006-03-23 18:58:47 +01:00
+++ 1.230/client/mysqltest.c	2006-03-23 21:48:26 +01:00
@@ -427,6 +427,7 @@
 static void var_free(void* v);
 
 void dump_result_to_reject_file(const char *record_file, char *buf, int size);
+void dump_result_to_log_file(const char *record_file, char *buf, int size);
 
 int close_connection(struct st_query*);
 static void set_charset(struct st_query*);
@@ -634,9 +635,9 @@
   }
   va_end(args);
 
-  /* Dump the result that has been accumulated so far to reject file */
+  /* Dump the result that has been accumulated so far to .log file */
   if (result_file && ds_res.length)
-    dump_result_to_reject_file(result_file, ds_res.str, ds_res.length);
+    dump_result_to_log_file(result_file, ds_res.str, ds_res.length);
 
   /* Clean up and exit */
   free_used_memory();
@@ -3137,6 +3138,12 @@
 {
   char reject_file[FN_REFLEN];
   str_to_file(fn_format(reject_file, record_file,"",".reject",2), buf, size);
+}
+
+void dump_result_to_log_file(const char *record_file, char *buf, int size)
+{
+  char log_file[FN_REFLEN];
+  str_to_file(fn_format(log_file, record_file,"",".log",2), buf, size);
 }