From: sayantan.dutta Date: January 4 2013 12:51pm Subject: bzr push into mysql-5.6 branch (sayantan.dutta:4843 to 4844) Bug#15970704 List-Archive: http://lists.mysql.com/commits/145567 X-Bug: 15970704 Message-Id: <201301041251.r04Cpfo3024588@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4844 sayantan.dutta@stripped 2013-01-04 Bug #15970704 - MTR DOES STUFF IN THE SOURCE TREE WHEN RUN FROM AN OUT-OF-SOURCE BUILD modified: client/mysqltest.cc 4843 Satya Bodapati 2013-01-04 [merge] Merge Post Fix for BUG#14628410 from mysql-5.5 to mysql-5.6 modified: storage/innobase/row/row0merge.cc === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2012-12-21 09:28:11 +0000 +++ b/client/mysqltest.cc 2013-01-04 12:48:31 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2024,18 +2024,9 @@ void check_result() size_t reject_length; dirname_part(reject_file, result_file_name, &reject_length); - if (access(reject_file, W_OK) == 0) - { - /* 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, + /* Put reject file in opt_logdir */ + fn_format(reject_file, result_file_name, opt_logdir, ".reject", MY_REPLACE_DIR | MY_REPLACE_EXT); - } if (my_copy(log_file.file_name(), reject_file, MYF(0)) != 0) die("Failed to copy '%s' to '%s', errno: %d", No bundle (reason: useless for push emails).