← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2008-11-07 23:16:58 UTC
  • mfrom: (575.1.14 devel)
  • Revision ID: brian@tangent.org-20081107231658-fboahr524d1or2ya
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
145
145
                          &SV::auto_increment_offset, NULL, NULL,
146
146
                          sys_var::SESSION_VARIABLE_IN_BINLOG);
147
147
 
148
 
static sys_var_const_str       sys_basedir(&vars, "basedir", mysql_home);
 
148
static sys_var_const_str       sys_basedir(&vars, "basedir", drizzle_home);
149
149
static sys_var_long_ptr sys_binlog_cache_size(&vars, "binlog_cache_size",
150
150
                                              &binlog_cache_size);
151
151
static sys_var_session_binlog_format sys_binlog_format(&vars, "binlog_format",
170
170
                     sys_var::SESSION_VARIABLE_IN_BINLOG);
171
171
static sys_var_long_ptr sys_connect_timeout(&vars, "connect_timeout",
172
172
                                            &connect_timeout);
173
 
static sys_var_const_str       sys_datadir(&vars, "datadir", mysql_real_data_home);
 
173
static sys_var_const_str       sys_datadir(&vars, "datadir", drizzle_real_data_home);
174
174
static sys_var_enum             sys_delay_key_write(&vars, "delay_key_write",
175
175
                                            &delay_key_write_options,
176
176
                                            &delay_key_write_typelib,
2927
2927
  if (type == OPT_GLOBAL)
2928
2928
    plugin= my_plugin_lock(session, &(global_system_variables.*offset));
2929
2929
  hton= plugin_data(plugin, handlerton*);
2930
 
  engine_name= &hton2plugin[hton->slot]->name;
 
2930
  engine_name= ha_storage_engine_name(hton);
2931
2931
  result= (unsigned char *) session->strmake(engine_name->str, engine_name->length);
2932
2932
  if (type == OPT_GLOBAL)
2933
2933
    plugin_unlock(session, plugin);