← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Brian Aker
  • Date: 2008-10-06 21:06:15 UTC
  • Revision ID: brian@tangent.org-20081006210615-65c8oe0wxkpcp6xl
Removed dead repl_failsafe file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
30
30
#include "rpl_rli.h"
31
31
#include "sql_repl.h"
32
32
#include "rpl_filter.h"
33
 
#include "repl_failsafe.h"
34
33
#include <mysys/thr_alarm.h>
35
34
#include <libdrizzle/sql_common.h>
36
35
#include <libdrizzle/errmsg.h>
2159
2158
  /* Forget the relay log's format */
2160
2159
  delete mi->rli.relay_log.description_event_for_queue;
2161
2160
  mi->rli.relay_log.description_event_for_queue= 0;
2162
 
  // TODO: make rpl_status part of Master_info
2163
 
  change_rpl_status(RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE);
2164
2161
  assert(thd->net.buff != 0);
2165
2162
  net_end(&thd->net); // destructor will not free it, because net.vio is 0
2166
2163
  close_thread_tables(thd);
3137
3134
    if (++err_count == master_retry_count)
3138
3135
    {
3139
3136
      slave_was_killed=1;
3140
 
      if (reconnect)
3141
 
        change_rpl_status(RPL_ACTIVE_SLAVE,RPL_LOST_SOLDIER);
3142
3137
      break;
3143
3138
    }
3144
3139
    safe_sleep(thd,mi->connect_retry,(CHECK_KILLED_FUNC)io_slave_killed,
3157
3152
                                IO_RPL_LOG_NAME,
3158
3153
                                llstr(mi->master_log_pos,llbuff));
3159
3154
    }
3160
 
    else
3161
 
    {
3162
 
      change_rpl_status(RPL_IDLE_SLAVE,RPL_ACTIVE_SLAVE);
3163
 
    }
3164
3155
  }
3165
3156
  drizzle->reconnect= 1;
3166
3157
  return(slave_was_killed);