← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: arjen at com
  • Date: 2008-08-25 13:26:34 UTC
  • mto: This revision was merged to the branch mainline in revision 371.
  • Revision ID: arjen@lentz.com.au-20080825132634-yh2563i3xvltoavx
Initial mods for making all tests work again. Some tests adapted+added.
List of tests in Makefile now alphabetically sorted, dups removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
1220
1220
      non-volotile members like mi->io_thd, which is guarded by the mutex.
1221
1221
    */
1222
1222
    pthread_mutex_lock(&mi->run_lock);
1223
 
    protocol->store(mi->io_thd ? mi->io_thd->get_proc_info() : "", &my_charset_bin);
 
1223
    protocol->store(mi->io_thd ? mi->io_thd->proc_info : "", &my_charset_bin);
1224
1224
    pthread_mutex_unlock(&mi->run_lock);
1225
1225
 
1226
1226
    pthread_mutex_lock(&mi->data_lock);
1905
1905
                            const char *messages[SLAVE_RECON_MSG_MAX])
1906
1906
{
1907
1907
  mi->slave_running= DRIZZLE_SLAVE_RUN_NOT_CONNECT;
1908
 
  thd->set_proc_info(_(messages[SLAVE_RECON_MSG_WAIT]));
 
1908
  thd->proc_info= _(messages[SLAVE_RECON_MSG_WAIT]);
1909
1909
#ifdef SIGNAL_WITH_VIO_CLOSE
1910
1910
  thd->clear_active_vio();
1911
1911
#endif
1920
1920
  if (check_io_slave_killed(thd, mi,
1921
1921
                            _(messages[SLAVE_RECON_MSG_KILLED_WAITING])))
1922
1922
    return 1;
1923
 
  thd->set_proc_info(_(messages[SLAVE_RECON_MSG_AFTER]));
 
1923
  thd->proc_info = _(messages[SLAVE_RECON_MSG_AFTER]);
1924
1924
  if (!suppress_warnings)
1925
1925
  {
1926
1926
    char buf[256], llbuff[22];
3162
3162
  drizzle_options(drizzle, DRIZZLE_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
3163
3163
  drizzle_options(drizzle, DRIZZLE_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
3164
3164
 
 
3165
  drizzle_options(drizzle, DRIZZLE_SET_CHARSET_NAME, default_charset_info->csname);
 
3166
  /* This one is not strictly needed but we have it here for completeness */
 
3167
  drizzle_options(drizzle, DRIZZLE_SET_CHARSET_DIR, (char *) charsets_dir);
 
3168
 
3165
3169
  while (!(slave_was_killed = io_slave_killed(thd,mi)) &&
3166
3170
         (reconnect ? drizzle_reconnect(drizzle) != 0 :
3167
3171
          drizzle_connect(drizzle, mi->host, mi->user, mi->password, 0,