bzr commit into mysql-5.1-bugteam branch (aelkin:3015) Bug#44115

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-5.1-bugteam/ based on revid:satya.bn@stripped

 3015 Andrei Elkin	2009-07-09
      Bug #44115 purge_relay_logs doesn't return an error when count_relay_log_space fails
      
      purge_relay_logs() did not propagate an error happend in count_relay_log_space().
      
      Fixed with the suggestesd setting the error= true.
      Note, propagation generally out of purge_relay_logs() was fixed for Bug #44179,
      and the issue does not exist in 6.0 thanks to a patch for WL#2775.
modified:
  sql/rpl_rli.cc

per-file messages:
  sql/rpl_rli.cc
    the error is set on if count_relay_log_space(rli) fails.
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2009-04-19 01:21:33 +0000
+++ b/sql/rpl_rli.cc	2009-07-09 07:28:38 +0000
@@ -947,6 +947,7 @@ int purge_relay_logs(Relay_log_info* rli
   if (count_relay_log_space(rli))
   {
     *errmsg= "Error counting relay log space";
+    error=1;
     goto err;
   }
   if (!just_reset)