← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Added code necessary for building plugins dynamically.
Merged in changes from lifeless to allow autoreconf to work.
Touching plugin.ini files now triggers a rebuid - so config/autorun.sh is no
longer required to be run after touching those.
Removed the duplicate plugin names - also removed the issue that getting them
different would silently fail weirdly later.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
225
225
static sys_var_session_uint64_t sys_tmp_table_size(&vars, "tmp_table_size",
226
226
                                           &SV::tmp_table_size);
227
227
static sys_var_bool_ptr  sys_timed_mutexes(&vars, "timed_mutexes", &timed_mutexes);
228
 
static sys_var_const_str        sys_version(&vars, "version", VERSION);
 
228
static sys_var_const_str        sys_version(&vars, "version", PANDORA_RELEASE_VERSION);
229
229
static sys_var_const_str        sys_version_comment(&vars, "version_comment",
230
230
                                            COMPILATION_COMMENT);
231
231
static sys_var_const_str        sys_version_compile_machine(&vars, "version_compile_machine",
2056
2056
    {
2057
2057
      const std::string engine_name(res->ptr());
2058
2058
      plugin::StorageEngine *engine;
2059
 
      var->save_result.storage_engine= plugin::StorageEngine::findByName(session, engine_name);
 
2059
      var->save_result.storage_engine= plugin::StorageEngine::findByName(*session, engine_name);
2060
2060
      if (var->save_result.storage_engine == NULL)
2061
2061
      {
2062
2062
        value= res->c_ptr();