diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
| commit | 26ee8f532edc7497a78114e65a261c7fb82531de (patch) | |
| tree | b5babca4ee608dc5e5daf9722eeb5c8414974565 /sql/rpl_injector.cc | |
| parent | 209df6a69fdebcaede67b8060eaa67fe639dc4ab (diff) | |
| parent | ffc16a2d06deb125f7ead5c4a9f6eb1fb3b48379 (diff) | |
| download | mariadb-git-26ee8f532edc7497a78114e65a261c7fb82531de.tar.gz | |
BUG#46166
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.
Conflicts
=========
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/rpl_injector.cc')
| -rw-r--r-- | sql/rpl_injector.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index 75ccb617e9e..52c8b9f0655 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -237,8 +237,7 @@ int injector::record_incident(THD *thd, Incident incident) Incident_log_event ev(thd, incident); if (int error= mysql_bin_log.write(&ev)) return error; - mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE); - return 0; + return mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE); } int injector::record_incident(THD *thd, Incident incident, LEX_STRING const message) @@ -246,6 +245,5 @@ int injector::record_incident(THD *thd, Incident incident, LEX_STRING const mess Incident_log_event ev(thd, incident, message); if (int error= mysql_bin_log.write(&ev)) return error; - mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE); - return 0; + return mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE); } |