bzr push into mysql-next-mr-wl5569 branch (alfranio.correia:3305 to 3306)

[Alfranio Correia]

 3306 Alfranio Correia	2011-06-19
      Fixed some windows failures.

    modified:
      sql/rpl_slave.cc
 3305 Alfranio Correia	2011-06-18
      Fixed some recovery issues.

    modified:
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      sql/log_event.cc
      sql/rpl_rli.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-06-18 18:58:21 +0000
+++ b/sql/rpl_slave.cc	2011-06-19 08:04:19 +0000
@@ -498,7 +498,15 @@ int remove_info(Master_info* mi)
           Rpl_info_factory::create_worker(opt_worker_repository_id, id, mi->rli)))
       goto err;
 
-    if (worker->init_info() || worker->remove_info())
+    if (worker->init_info())
+    {
+      delete worker;
+      goto err;
+    }
+
+    worker->end_info();
+
+    if (worker->remove_info())
     {
       delete worker;
       goto err;

No bundle (reason: useless for push emails).