#At file:///home/andrei/MySQL/BZR/MERGE/5.1-bt/ based on revid:sergey.glukhov@stripped
2883 Andrei Elkin 2009-04-30 [merge]
merge bug#44179 fixes to 5.1-bt
modified:
sql/sql_repl.cc
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2009-02-13 16:41:47 +0000
+++ b/sql/sql_repl.cc 2009-04-30 12:28:07 +0000
@@ -1026,7 +1026,10 @@ int reset_slave(THD *thd, Master_info* m
if ((error= purge_relay_logs(&mi->rli, thd,
1 /* just reset */,
&errmsg)))
+ {
+ sql_errno= ER_RELAY_LOG_FAIL;
goto err;
+ }
/*
Clear master's log coordinates and reset host/user/etc to the values
| Thread |
|---|
| • bzr commit into mysql-5.1-bugteam branch (aelkin:2883) Bug#44179 | Andrei Elkin | 30 Apr |