← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/variables.cc

  • Committer: Brian Aker
  • Date: 2009-11-30 19:13:19 UTC
  • mfrom: (1225.1.39 figure)
  • Revision ID: brian@gaz-20091130191319-zyt51fidacic3brf
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/variables.cc
137
137
  delete var_table;
138
138
}
139
139
 
140
 
int VariablesISMethods::fillTable(Session *session, TableList *tables)
 
140
int VariablesISMethods::fillTable(Session *session, 
 
141
                                  Table *table,
 
142
                                  plugin::InfoSchemaTable *schema_table)
141
143
{
142
144
  int res= 0;
143
145
  LEX *lex= session->lex;
144
146
  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
145
 
  const string schema_table_name= tables->schema_table->getTableName();
 
147
  const string schema_table_name= schema_table->getTableName();
146
148
  enum enum_var_type option_type= OPT_SESSION;
147
149
  bool upper_case_names= (schema_table_name.compare("VARIABLES") != 0);
148
150
  bool sorted_vars= (schema_table_name.compare("VARIABLES") == 0);
155
157
 
156
158
  pthread_rwlock_rdlock(&LOCK_system_variables_hash);
157
159
  res= show_status_array(session, wild, enumerate_sys_vars(session, sorted_vars),
158
 
                         option_type, NULL, "", tables->table, upper_case_names);
 
160
                         option_type, NULL, "", table, upper_case_names, schema_table);
159
161
  pthread_rwlock_unlock(&LOCK_system_variables_hash);
160
162
  return res;
161
163
}