Commit b07a4abc authored by unknown's avatar unknown

Bug#31398 problems with mysql-test-run, part2

Write .reject file to r/ if it's writable else use opt_logdir 


client/mysqltest.c:
  Write .reject file to r/ if it's writable else use opt_logdir
parent 133bd811
...@@ -1580,10 +1580,21 @@ void check_result(DYNAMIC_STRING* ds) ...@@ -1580,10 +1580,21 @@ void check_result(DYNAMIC_STRING* ds)
and then show the diff and then show the diff
*/ */
char reject_file[FN_REFLEN]; char reject_file[FN_REFLEN];
str_to_file(fn_format(reject_file, result_file_name, opt_logdir, ".reject", dirname_part(reject_file, result_file_name);
*opt_logdir ? MY_REPLACE_DIR | MY_REPLACE_EXT :
MY_REPLACE_EXT), if (access(reject_file, W_OK) == 0)
ds->str, ds->length); {
/* Result file directory is writable, save reject file there */
fn_format(reject_file, result_file_name, NULL,
".reject", MY_REPLACE_EXT);
}
else
{
/* Put reject file in opt_logdir */
fn_format(reject_file, result_file_name, opt_logdir,
".reject", MY_REPLACE_DIR | MY_REPLACE_EXT);
}
str_to_file(reject_file, ds->str, ds->length);
dynstr_set(ds, NULL); /* Don't create a .log file */ dynstr_set(ds, NULL); /* Don't create a .log file */
......
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