Commit 89e08bf3 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: reformat

* reformat long lines
* remove useless 'const'
* remove unneeded do { ... } while(false} wrapper
* remove unneeded method
parent 5018a660
...@@ -4439,12 +4439,6 @@ end: ...@@ -4439,12 +4439,6 @@ end:
DBUG_RETURN(thd->is_slave_error); DBUG_RETURN(thd->is_slave_error);
} }
int Query_log_event::do_update_pos(rpl_group_info *rgi)
{
return Log_event::do_update_pos(rgi);
}
Log_event::enum_skip_reason Log_event::enum_skip_reason
Query_log_event::do_shall_skip(rpl_group_info *rgi) Query_log_event::do_shall_skip(rpl_group_info *rgi)
{ {
...@@ -4980,7 +4974,7 @@ bool Format_description_log_event::write(IO_CACHE* file) ...@@ -4980,7 +4974,7 @@ bool Format_description_log_event::write(IO_CACHE* file)
slave does it via marking the event according to slave does it via marking the event according to
FD_queue checksum_alg value. FD_queue checksum_alg value.
*/ */
compile_time_assert(sizeof(BINLOG_CHECKSUM_ALG_DESC_LEN == 1)); compile_time_assert(BINLOG_CHECKSUM_ALG_DESC_LEN == 1);
#ifndef DBUG_OFF #ifndef DBUG_OFF
data_written= 0; // to prepare for need_checksum assert data_written= 0; // to prepare for need_checksum assert
#endif #endif
...@@ -5019,7 +5013,7 @@ bool Format_description_log_event::write(IO_CACHE* file) ...@@ -5019,7 +5013,7 @@ bool Format_description_log_event::write(IO_CACHE* file)
int Format_description_log_event::do_apply_event(rpl_group_info *rgi) int Format_description_log_event::do_apply_event(rpl_group_info *rgi)
{ {
int ret= 0; int ret= 0;
Relay_log_info const *rli= rgi->rli; Relay_log_info *rli= rgi->rli;
DBUG_ENTER("Format_description_log_event::do_apply_event"); DBUG_ENTER("Format_description_log_event::do_apply_event");
/* /*
...@@ -5067,7 +5061,7 @@ int Format_description_log_event::do_apply_event(rpl_group_info *rgi) ...@@ -5067,7 +5061,7 @@ int Format_description_log_event::do_apply_event(rpl_group_info *rgi)
{ {
/* Save the information describing this binlog */ /* Save the information describing this binlog */
delete rli->relay_log.description_event_for_exec; delete rli->relay_log.description_event_for_exec;
const_cast<Relay_log_info *>(rli)->relay_log.description_event_for_exec= this; rli->relay_log.description_event_for_exec= this;
} }
DBUG_RETURN(ret); DBUG_RETURN(ret);
......
...@@ -2014,7 +2014,6 @@ public: /* !!! Public in this patch to allow old usage */ ...@@ -2014,7 +2014,6 @@ public: /* !!! Public in this patch to allow old usage */
#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi); virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
virtual int do_apply_event(rpl_group_info *rgi); virtual int do_apply_event(rpl_group_info *rgi);
virtual int do_update_pos(rpl_group_info *rgi);
int do_apply_event(rpl_group_info *rgi, int do_apply_event(rpl_group_info *rgi,
const char *query_arg, const char *query_arg,
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment