← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Monty Taylor
  • Date: 2008-10-06 04:45:56 UTC
  • mfrom: (438.1.13 drizzle)
  • Revision ID: monty@inaugust.com-20081006044556-5urk8k3yhnnl3o1p
Merged in from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
340
340
static sys_var_long_ptr sys_server_id(&vars, "server_id", &server_id, fix_server_id);
341
341
static sys_var_bool_ptr sys_slave_compressed_protocol(&vars, "slave_compressed_protocol",
342
342
                                                      &opt_slave_compressed_protocol);
343
 
#ifdef HAVE_REPLICATION
344
343
static sys_var_bool_ptr         sys_slave_allow_batching(&vars, "slave_allow_batching",
345
344
                                                         &slave_allow_batching);
346
345
static sys_var_set_slave_mode slave_exec_mode(&vars,
348
347
                                              &slave_exec_mode_options,
349
348
                                              &slave_exec_mode_typelib,
350
349
                                              0);
351
 
#endif
352
350
static sys_var_long_ptr sys_slow_launch_time(&vars, "slow_launch_time",
353
351
                                             &slow_launch_time);
354
352
static sys_var_thd_ulong        sys_sort_buffer(&vars, "sort_buffer_size",
734
732
  If we are changing the thread variable, we have to copy it to NET too
735
733
*/
736
734
 
737
 
#ifdef HAVE_REPLICATION
738
735
static void fix_net_read_timeout(THD *thd, enum_var_type type)
739
736
{
740
737
  if (type != OPT_GLOBAL)
753
750
  if (type != OPT_GLOBAL)
754
751
    thd->net.retry_count=thd->variables.net_retry_count;
755
752
}
756
 
#else /* HAVE_REPLICATION */
757
 
static void fix_net_read_timeout(THD *thd __attribute__((unused)),
758
 
                                 enum_var_type type __attribute__((unused)))
759
 
{}
760
 
static void fix_net_write_timeout(THD *thd __attribute__((unused)),
761
 
                                  enum_var_type type __attribute__((unused)))
762
 
{}
763
 
static void fix_net_retry_count(THD *thd __attribute__((unused)),
764
 
                                enum_var_type type __attribute__((unused)))
765
 
{}
766
 
#endif /* HAVE_REPLICATION */
767
753
 
768
754
 
769
755
extern void fix_delay_key_write(THD *thd __attribute__((unused)),
903
889
                                enum_var_type type __attribute__((unused)))
904
890
{
905
891
  mysql_bin_log.set_max_size(max_binlog_size);
906
 
#ifdef HAVE_REPLICATION
907
892
  if (!max_relay_log_size)
908
893
    active_mi->rli.relay_log.set_max_size(max_binlog_size);
909
 
#endif
910
894
  return;
911
895
}
912
896
 
913
897
static void fix_max_relay_log_size(THD *thd __attribute__((unused)),
914
898
                                   enum_var_type type __attribute__((unused)))
915
899
{
916
 
#ifdef HAVE_REPLICATION
917
900
  active_mi->rli.relay_log.set_max_size(max_relay_log_size ?
918
901
                                        max_relay_log_size: max_binlog_size);
919
 
#endif
920
902
  return;
921
903
}
922
904