← 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-16 01:37:05 UTC
  • mto: This revision was merged to the branch mainline in revision 391.
  • Revision ID: monty@inaugust.com-20080916013705-772d1t7rh9ah9j1x
Moved more functions into drizzle.c as part of the split of code.
Added accessor function for drizzle_port.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
1901
1901
*/
1902
1902
 
1903
1903
static int32_t try_to_reconnect(THD *thd, DRIZZLE *drizzle, Master_info *mi,
1904
 
                            uint32_t *retry_count, bool suppress_warnings,
1905
 
                            const char *messages[SLAVE_RECON_MSG_MAX])
 
1904
                                uint32_t *retry_count, bool suppress_warnings,
 
1905
                                const char *messages[SLAVE_RECON_MSG_MAX])
1906
1906
{
1907
1907
  mi->slave_running= DRIZZLE_SLAVE_RUN_NOT_CONNECT;
1908
1908
  thd->set_proc_info(_(messages[SLAVE_RECON_MSG_WAIT]));
1909
 
  end_server(drizzle);
 
1909
  drizzle_disconnect(drizzle);
1910
1910
  if ((*retry_count)++)
1911
1911
  {
1912
1912
    if (*retry_count > master_retry_count)
3141
3141
*/
3142
3142
 
3143
3143
static int32_t connect_to_master(THD* thd, DRIZZLE *drizzle, Master_info* mi,
3144
 
                             bool reconnect, bool suppress_warnings)
 
3144
                                 bool reconnect, bool suppress_warnings)
3145
3145
{
3146
3146
  int32_t slave_was_killed;
3147
3147
  int32_t last_errno= -2;                           // impossible error