← 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-14 19:39:48 UTC
  • mfrom: (383.1.43 client-split)
  • Revision ID: monty@inaugust.com-20080914193948-ns2p0lts4qtsqx7n
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
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
 
 
3169
3165
  while (!(slave_was_killed = io_slave_killed(thd,mi)) &&
3170
3166
         (reconnect ? drizzle_reconnect(drizzle) != 0 :
3171
3167
          drizzle_connect(drizzle, mi->host, mi->user, mi->password, 0,