client/mysqltest.c

    fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test
    testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test
    test purge master logs
sql/slave.cc
    fix memory leaks found by  purge master logs test
sql/sql_repl.cc
    fixed race condition and delete before close bug in reset_slave()

Overall comments - coverage testing is a very good thing!


client/mysqltest.c:
  fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test:
  testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test:
  test purge master logs
sql/slave.cc:
  fix memory leaks found by  purge master logs test
sql/sql_repl.cc:
  fixed race condition and delete before close bug in reset_slave()

1 files changed, 3 insertions, 3 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index fd1e4df18ba..9917a91a9cb 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1306,11 +1306,11 @@ int main(int argc, char** argv)
 
   close_cons();
 
-  if(result_file)
+  if(result_file && ds_res.len)
     {
-      if(!record && ds_res.len)
+      if(!record)
 	error |= check_result(&ds_res, result_file);
-      else
+      else 
 	str_to_file(result_file, ds_res.str, ds_res.len);
     }
   dyn_string_end(&ds_res);