← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: lbieber
  • Date: 2010-09-26 02:09:47 UTC
  • mfrom: (1791.3.5 local-catalog)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: lbieber@orisndriz08-20100926020947-o28psemscwvlwg05
Merge Monty - Beginning of catalog support, adds a default local catalog. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
144
144
                                                    fix_completion_type);
145
145
static sys_var_collation_sv
146
146
sys_collation_server(&vars, "collation_server", &system_variables::collation_server, &default_charset_info);
147
 
static sys_var_const_str       sys_datadir(&vars, "datadir", data_home_real);
 
147
static sys_var_const_str_ptr       sys_datadir(&vars, "datadir", getDatadirPtr());
148
148
 
149
149
static sys_var_session_uint64_t sys_join_buffer_size(&vars, "join_buffer_size",
150
150
                                                     &system_variables::join_buff_size);