Commit e6bf664c authored by msvensson@shellback.(none)'s avatar msvensson@shellback.(none)

Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl

into  shellback.(none):/home/msvensson/mysql/mysql-5.0
parents 3c365461 2b38c41b
...@@ -615,6 +615,8 @@ static void die(const char *fmt, ...) ...@@ -615,6 +615,8 @@ static void die(const char *fmt, ...)
{ {
va_list args; va_list args;
DBUG_ENTER("die"); DBUG_ENTER("die");
/* Print the error message */
va_start(args, fmt); va_start(args, fmt);
if (fmt) if (fmt)
{ {
...@@ -629,6 +631,15 @@ static void die(const char *fmt, ...) ...@@ -629,6 +631,15 @@ static void die(const char *fmt, ...)
fflush(stderr); fflush(stderr);
} }
va_end(args); 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(); free_used_memory();
my_end(MY_CHECK_ERROR); my_end(MY_CHECK_ERROR);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment