← 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: 2009-02-08 09:53:59 UTC
  • mfrom: (832.2.10 drizzle-nomaxcon)
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mordred@inaugust.com-20090208095359-39xjloxzpjr1mkg4
Merged from Mark.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
101
101
static void fix_net_write_timeout(Session *session, enum_var_type type);
102
102
static void fix_net_retry_count(Session *session, enum_var_type type);
103
103
static void fix_max_join_size(Session *session, enum_var_type type);
104
 
static void fix_max_connections(Session *session, enum_var_type type);
105
104
static void fix_session_mem_root(Session *session, enum_var_type type);
106
105
static void fix_trans_mem_root(Session *session, enum_var_type type);
107
106
static void fix_server_id(Session *session, enum_var_type type);
182
181
                                         &opt_local_infile);
183
182
static sys_var_session_uint32_t sys_max_allowed_packet(&vars, "max_allowed_packet",
184
183
                                                       &SV::max_allowed_packet);
185
 
static sys_var_long_ptr sys_max_connections(&vars, "max_connections",
186
 
                                            &max_connections,
187
 
                                            fix_max_connections);
188
184
static sys_var_long_ptr sys_max_connect_errors(&vars, "max_connect_errors",
189
185
                                               &max_connect_errors);
190
186
static sys_var_session_uint64_t sys_max_error_count(&vars, "max_error_count",
444
440
#endif
445
441
  {"log_bin",                 (char*) &opt_bin_log,                 SHOW_BOOL},
446
442
  {"myisam_recover_options",  (char*) &myisam_recover_options_str,  SHOW_CHAR_PTR},
447
 
  {"open_files_limit",        (char*) &open_files_limit,                  SHOW_LONGLONG},
448
443
  {"pid_file",                (char*) pidfile_name,                 SHOW_CHAR},
449
444
  {"plugin_dir",              (char*) opt_plugin_dir,               SHOW_CHAR},
450
445
  {"port",                    (char*) &drizzled_port,               SHOW_INT},
619
614
  }
620
615
}
621
616
 
622
 
static void fix_max_connections(Session *, enum_var_type)
623
 
{
624
 
  resize_thr_alarm(max_connections +  10);
625
 
}
626
 
 
627
617
 
628
618
static void fix_session_mem_root(Session *session, enum_var_type type)
629
619
{