← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
1236
1236
                    &my_charset_bin);
1237
1237
    protocol->store((uint64_t) mi->rli.group_relay_log_pos);
1238
1238
    protocol->store(mi->rli.group_master_log_name, &my_charset_bin);
1239
 
    protocol->store(mi->slave_running == MYSQL_SLAVE_RUN_CONNECT ?
 
1239
    protocol->store(mi->slave_running == DRIZZLE_SLAVE_RUN_CONNECT ?
1240
1240
                    "Yes" : "No", &my_charset_bin);
1241
1241
    protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin);
1242
1242
    protocol->store(rpl_filter->get_do_db());
1277
1277
      Seconds_Behind_Master: if SQL thread is running and I/O thread is
1278
1278
      connected, we can compute it otherwise show NULL (i.e. unknown).
1279
1279
    */
1280
 
    if ((mi->slave_running == MYSQL_SLAVE_RUN_CONNECT) &&
 
1280
    if ((mi->slave_running == DRIZZLE_SLAVE_RUN_CONNECT) &&
1281
1281
        mi->rli.slave_running)
1282
1282
    {
1283
1283
      long time_diff= ((long)(time(0) - mi->rli.last_master_timestamp)
1904
1904
                            uint32_t *retry_count, bool suppress_warnings,
1905
1905
                            const char *messages[SLAVE_RECON_MSG_MAX])
1906
1906
{
1907
 
  mi->slave_running= MYSQL_SLAVE_RUN_NOT_CONNECT;
 
1907
  mi->slave_running= DRIZZLE_SLAVE_RUN_NOT_CONNECT;
1908
1908
  thd->proc_info= _(messages[SLAVE_RECON_MSG_WAIT]);
1909
1909
#ifdef SIGNAL_WITH_VIO_CLOSE
1910
1910
  thd->clear_active_vio();
2028
2028
connected:
2029
2029
 
2030
2030
  // TODO: the assignment below should be under mutex (5.0)
2031
 
  mi->slave_running= MYSQL_SLAVE_RUN_CONNECT;
 
2031
  mi->slave_running= DRIZZLE_SLAVE_RUN_CONNECT;
2032
2032
  thd->slave_net = &drizzle->net;
2033
2033
  thd_proc_info(thd, "Checking master version");
2034
2034
  if (get_master_version_and_clock(drizzle, mi))
3399
3399
      When the relay log is created when the I/O thread starts, easy: the
3400
3400
      master will send the description event and we will queue it.
3401
3401
      But if the relay log is created by new_file(): then the solution is:
3402
 
      MYSQL_BIN_LOG::open() will write the buffered description event.
 
3402
      DRIZZLE_BIN_LOG::open() will write the buffered description event.
3403
3403
    */
3404
3404
    if ((ev=Log_event::read_log_event(cur_log,0,
3405
3405
                                      rli->relay_log.description_event_for_exec)))
3668
3668
  Rotate a relay log (this is used only by FLUSH LOGS; the automatic rotation
3669
3669
  because of size is simpler because when we do it we already have all relevant
3670
3670
  locks; here we don't, so this function is mainly taking locks).
3671
 
  Returns nothing as we cannot catch any error (MYSQL_BIN_LOG::new_file()
 
3671
  Returns nothing as we cannot catch any error (DRIZZLE_BIN_LOG::new_file()
3672
3672
  is void).
3673
3673
*/
3674
3674