← Back to branch summary

~jaypipes/drizzle/replication-ddl

« back to all changes in this revision

Viewing changes to plugin/status_dictionary/status.cc

  • Committer: Jay Pipes
  • Date: 2010-04-05 20:46:51 UTC
  • mfrom: (1405.4.28 bad-staging)
  • Revision ID: jpipes@serialcoder-20100405204651-i3cduqz35ai9n54b
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/status_dictionary/status.cc
62
62
  }
63
63
  else
64
64
  {
65
 
    Session *session= current_session;
66
 
    status_ptr= &session->status_var;
 
65
    status_ptr= &getSession().status_var;
67
66
  }
68
67
}
69
68
 
118
117
extern drizzled::KEY_CACHE dflt_key_cache_var, *dflt_key_cache;
119
118
void StateTool::Generator::fill(const std::string &name, char *value, SHOW_TYPE show_type)
120
119
{
121
 
  Session *session= current_session;
122
120
  struct system_status_var *status_var;
123
121
  std::ostringstream oss;
124
122
 
133
131
  if (show_type == SHOW_SYS)
134
132
  {
135
133
    show_type= ((sys_var*) value)->show_type();
136
 
    value= (char*) ((sys_var*) value)->value_ptr(session, option_type,
 
134
    value= (char*) ((sys_var*) value)->value_ptr(&(getSession()), option_type,
137
135
                                                 &null_lex_str);
138
136
  }
139
137