bk commit into 4.1 tree (msvensson:1.2471)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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.2471 06/03/23 15:04:46 msvensson@shellback.(none) +1 -0
  Dump reject file before mysqltest in 'die'
  Makes it easier to see what happened before the failure

  client/mysqltest.c
    1.195 06/03/23 15:04:41 msvensson@shellback.(none) +11 -0
    Dump reject file before mysqltest in 'die'

# 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/mysqltestrun_pl/my50-mysqltestrun_pl

--- 1.194/client/mysqltest.c	2006-03-03 20:57:16 +01:00
+++ 1.195/client/mysqltest.c	2006-03-23 15:04:41 +01:00
@@ -573,6 +573,8 @@
 {
   va_list args;
   DBUG_ENTER("die");
+
+  /* Print the error message */
   va_start(args, fmt);
   if (fmt)
   {
@@ -587,6 +589,15 @@
     fflush(stderr);
   }
   va_end(args);
+
+  /* Dump the result that has been accumulated so far to reject file */
+  if (result_file && ds_res.length)
+  {
+
+    reject_dump(result_file, ds_res.str, ds_res.length);
+  }
+
+  /* Clean up and exit */
   free_used_memory();
   my_end(MY_CHECK_ERROR);
   exit(1);