← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/variables.cc

Merged up with brian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/variables.cc
68
68
 
69
69
  if (glob_var_table == NULL)
70
70
  {
71
 
    glob_var_table= new plugin::InfoSchemaTable("GLOBAL_VARIABLES",
 
71
    glob_var_table= new plugin::InfoSchemaTable("OLD_GLOBAL_VARIABLES",
72
72
                                                *status_columns,
73
73
                                                -1, -1, false, false,
74
74
                                                0, 
96
96
{
97
97
  if (sess_var_table == NULL)
98
98
  {
99
 
    sess_var_table= new plugin::InfoSchemaTable("SESSION_VARIABLES",
 
99
    sess_var_table= new plugin::InfoSchemaTable("OLD_SESSION_VARIABLES",
100
100
                                                *status_columns,
101
101
                                                -1, -1, false, false, 0,
102
102
                                                methods);
122
122
{
123
123
  if (var_table == NULL)
124
124
  {
125
 
    var_table= new plugin::InfoSchemaTable("VARIABLES",
 
125
    var_table= new plugin::InfoSchemaTable("OLD_VARIABLES",
126
126
                                           *status_columns,
127
127
                                           -1, -1, true, false, 0,
128
128
                                           methods);
148
148
  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
149
149
  const string schema_table_name= schema_table->getTableName();
150
150
  sql_var_t option_type= OPT_SESSION;
151
 
  bool upper_case_names= (schema_table_name.compare("VARIABLES") != 0);
152
 
  bool sorted_vars= (schema_table_name.compare("VARIABLES") == 0);
 
151
  bool sorted_vars= (schema_table_name.compare("OLD_VARIABLES") == 0);
153
152
 
154
153
  if (lex->option_type == OPT_GLOBAL ||
155
154
      schema_table_name.compare("GLOBAL_VARIABLES") == 0)
159
158
 
160
159
  pthread_rwlock_rdlock(&LOCK_system_variables_hash);
161
160
  res= show_status_array(session, wild, enumerate_sys_vars(session, sorted_vars),
162
 
                         option_type, NULL, "", table, upper_case_names, schema_table);
 
161
                         option_type, NULL, "", table, false, schema_table);
163
162
  pthread_rwlock_unlock(&LOCK_system_variables_hash);
164
163
  return res;
165
164
}