summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-07-09 10:28:38 +0300
committerAndrei Elkin <aelkin@mysql.com>2009-07-09 10:28:38 +0300
commit22717a04598853b6a2327679b17d5e3557faa52a (patch)
tree11ea7f1091b7ba4f39e7d9090b945810d8e7e88b /sql/rpl_rli.cc
parent584e9f60d2ea1491da9aa4b145512453bd3285df (diff)
downloadmariadb-git-22717a04598853b6a2327679b17d5e3557faa52a.tar.gz
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. sql/rpl_rli.cc: the error is set on if count_relay_log_space(rli) fails.
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 45c0efb10c2..18fbae9bb9d 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -947,6 +947,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset,
if (count_relay_log_space(rli))
{
*errmsg= "Error counting relay log space";
+ error=1;
goto err;
}
if (!just_reset)