← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/status.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/status.cc
74
74
                                                   DRIZZLE_TYPE_VARCHAR,
75
75
                                                   0,
76
76
                                                   0,
77
 
                                                   "Variable_name",
78
 
                                                   SKIP_OPEN_TABLE));
 
77
                                                   "Variable_name"));
79
78
 
80
79
  status_columns->push_back(new plugin::ColumnInfo("VARIABLE_VALUE",
81
80
                                                   16300,
82
81
                                                   DRIZZLE_TYPE_VARCHAR,
83
82
                                                   0,
84
83
                                                   1,
85
 
                                                   "Value",
86
 
                                                   SKIP_OPEN_TABLE));
 
84
                                                   "Value"));
87
85
 
88
86
  return status_columns;
89
87
}
178
176
  delete status_table;
179
177
}
180
178
 
181
 
int StatusISMethods::fillTable(Session *session, TableList *tables)
 
179
int StatusISMethods::fillTable(Session *session, 
 
180
                               Table *table,
 
181
                               plugin::InfoSchemaTable *schema_table)
182
182
{
183
183
  LEX *lex= session->lex;
184
184
  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
185
185
  int res= 0;
186
186
  STATUS_VAR *tmp1, tmp;
187
 
  const string schema_table_name= tables->schema_table->getTableName();
 
187
  const string schema_table_name= schema_table->getTableName();
188
188
  enum enum_var_type option_type;
189
189
  bool upper_case_names= (schema_table_name.compare("STATUS") != 0);
190
190
 
218
218
  }
219
219
  res= show_status_array(session, wild,
220
220
                         getFrontOfStatusVars(),
221
 
                         option_type, tmp1, "", tables->table,
222
 
                         upper_case_names);
 
221
                         option_type, tmp1, "", table,
 
222
                         upper_case_names,
 
223
                         schema_table);
223
224
  pthread_mutex_unlock(&LOCK_status);
224
225
  return res;
225
226
}