~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2009-07-01 02:41:00 UTC
  • mfrom: (1081.1.4 mordred)
  • Revision ID: brian@gaz-20090701024100-nefdy7pnychzpg7h
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
272
272
static sys_var_session_uint64_t sys_tmp_table_size(&vars, "tmp_table_size",
273
273
                                           &SV::tmp_table_size);
274
274
static sys_var_bool_ptr  sys_timed_mutexes(&vars, "timed_mutexes", &timed_mutexes);
275
 
static sys_var_const_str        sys_version(&vars, "version", server_version);
 
275
static sys_var_const_str        sys_version(&vars, "version", VERSION);
276
276
static sys_var_const_str        sys_version_comment(&vars, "version_comment",
277
277
                                            COMPILATION_COMMENT);
278
278
static sys_var_const_str        sys_version_compile_machine(&vars, "version_compile_machine",
279
 
                                                    MACHINE_TYPE);
 
279
                                                      HOST_CPU);
280
280
static sys_var_const_str        sys_version_compile_os(&vars, "version_compile_os",
281
 
                                               SYSTEM_TYPE);
 
281
                                                 HOST_OS);
 
282
static sys_var_const_str        sys_version_compile_vendor(&vars, "version_compile_vendor",
 
283
                                                 HOST_VENDOR);
282
284
static sys_var_session_uint32_t sys_net_wait_timeout(&vars, "wait_timeout",
283
285
                                                     &SV::net_wait_timeout);
284
286