← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Eric Day
  • Date: 2009-10-31 21:53:33 UTC
  • mfrom: (1200 staging)
  • mto: This revision was merged to the branch mainline in revision 1202.
  • Revision ID: eday@oddments.org-20091031215333-j94bjoanwmi68p6f
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
59
59
#include <drizzled/item/float.h>
60
60
#include <drizzled/plugin.h>
61
61
 
62
 
#include "drizzled/registry.h"
 
62
#include "drizzled/name_map.h"
63
63
#include <map>
64
64
#include <algorithm>
65
65
 
71
71
 
72
72
class sys_var_pluginvar;
73
73
static DYNAMIC_ARRAY fixed_show_vars;
74
 
static drizzled::Registry<sys_var *> system_variable_hash;
 
74
static NameMap<sys_var *> system_variable_hash;
75
75
extern char *opt_drizzle_tmpdir;
76
76
 
77
77
const char *bool_type_names[]= { "OFF", "ON", NULL };
1779
1779
    SHOW_VAR *show= result + fixed_count;
1780
1780
    memcpy(result, fixed_show_vars.buffer, fixed_count * sizeof(SHOW_VAR));
1781
1781
 
1782
 
    drizzled::Registry<sys_var *>::const_iterator iter;
 
1782
    NameMap<sys_var *>::const_iterator iter;
1783
1783
    for(iter= system_variable_hash.begin();
1784
1784
        iter != system_variable_hash.end();
1785
1785
        iter++)
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();