← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Monty Taylor
  • Date: 2008-09-15 00:45:28 UTC
  • mto: This revision was merged to the branch mainline in revision 388.
  • Revision ID: monty@inaugust.com-20080915004528-okbr4xv40lgvgww4
Removed libvio deps from drizzled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
1906
1906
{
1907
1907
  mi->slave_running= DRIZZLE_SLAVE_RUN_NOT_CONNECT;
1908
1908
  thd->set_proc_info(_(messages[SLAVE_RECON_MSG_WAIT]));
1909
 
#ifdef SIGNAL_WITH_VIO_CLOSE
1910
 
  thd->clear_active_vio();
1911
 
#endif
1912
1909
  end_server(drizzle);
1913
1910
  if ((*retry_count)++)
1914
1911
  {
2195
2192
      can be called in the middle of closing the VIO associated with
2196
2193
      the 'mysql' object, causing a crash.
2197
2194
    */
2198
 
#ifdef SIGNAL_WITH_VIO_CLOSE
2199
 
    thd->clear_active_vio();
2200
 
#endif
2201
2195
    drizzle_close(drizzle);
2202
2196
    mi->drizzle=0;
2203
2197
  }
3214
3208
      general_log_print(thd, COM_CONNECT_OUT, "%s@%s:%d",
3215
3209
                        mi->user, mi->host, mi->port);
3216
3210
    }
3217
 
#ifdef SIGNAL_WITH_VIO_CLOSE
3218
 
    thd->set_active_vio(drizzle->net.vio);
3219
 
#endif
3220
3211
  }
3221
3212
  drizzle->reconnect= 1;
3222
3213
  return(slave_was_killed);