Browse Source

Eliminating some compiler warnings.

sql/log_event.cc:
  Adding non-reachable return statement at end of function to keep compiler
  happy.
sql/slave.cc:
  In order to keep compiler happy: using variable only used in debug code
  instead of recalling virtual function.
pull/374/head
unknown 19 years ago
parent
commit
04c0f3cb6a
  1. 1
      sql/log_event.cc
  2. 4
      sql/slave.cc

1
sql/log_event.cc

@ -3683,6 +3683,7 @@ Rotate_log_event::do_shall_skip(RELAY_LOG_INFO *rli)
return Log_event::EVENT_SKIP_IGNORE;
}
DBUG_ASSERT(0);
return Log_event::EVENT_SKIP_NOT; // To keep compiler happy
}
#endif

4
sql/slave.cc

@ -1722,7 +1722,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
}
if (ev)
{
int type_code = ev->get_type_code();
int const type_code= ev->get_type_code();
int exec_res= 0;
/*
@ -1828,7 +1828,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
used to read info about the relay log's format; it will be deleted when
the SQL thread does not need it, i.e. when this thread terminates.
*/
if (ev->get_type_code() != FORMAT_DESCRIPTION_EVENT)
if (type_code != FORMAT_DESCRIPTION_EVENT)
{
DBUG_PRINT("info", ("Deleting the event after it has been executed"));
delete ev;

Loading…
Cancel
Save