← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/status_dictionary/status.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 01:41:04 UTC
  • mfrom: (2114.3.2 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2116.
  • Revision ID: brian@tangent.org-20110126014104-20nfzp957mbwkkj9
Merge in latest catalogs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/status_dictionary/status.cc
95
95
  std::ostringstream oss;
96
96
  std::string return_value;
97
97
 
98
 
  LOCK_global_system_variables.lock();
99
 
 
100
 
  if (show_type == SHOW_SYS)
101
98
  {
102
 
    show_type= ((sys_var*) value)->show_type();
103
 
    value= (char*) ((sys_var*) value)->value_ptr(&(getSession()), option_type,
104
 
                                                 &null_lex_str);
 
99
    boost::mutex::scoped_lock scopedLock(getSession().catalog().systemVariableLock());
 
100
 
 
101
    if (show_type == SHOW_SYS)
 
102
    {
 
103
      show_type= ((sys_var*) value)->show_type();
 
104
      value= (char*) ((sys_var*) value)->value_ptr(&(getSession()), option_type,
 
105
                                                   &null_lex_str);
 
106
    }
 
107
 
 
108
    return_value= StatusHelper::fillHelper(NULL, value, show_type); 
105
109
  }
106
 
 
107
 
  return_value= StatusHelper::fillHelper(NULL, value, show_type); 
108
 
 
109
 
  LOCK_global_system_variables.unlock();
110
110
  push(name);
 
111
 
111
112
  if (return_value.length())
112
113
    push(return_value);
113
114
  else