Merge lp:~posulliv/drizzle/info-schema-plugin into lp:~drizzle-trunk/drizzle/development

[Padraig O'Sullivan]

[Padraig O'Sullivan (posulliv)]

This patch completes the work on extracting the current I_S into a plugin by extracting the final 6 I_S tables into the I_S plugin. No I_S tables are created in show.cc anymore.

-Padraig

[lp:~posulliv/drizzle/info-schema-plugin]

1090. By Brian Aker <brian@gaz> on 2009-07-09

Merge from Monty

1091. By Brian Aker <brian@gaz> on 2009-07-11

Collection of patches from new-cleanup (includes asserts for field in debug)

1092. By Brian Aker <brian@gaz> on 2009-07-11

Merge Monty

1093. By Brian Aker <brian@gaz> on 2009-07-11

Merge Brian

1094. By Brian Aker <brian@gaz> on 2009-07-12

Merge Stewart

1095. By Brian Aker <brian@gaz> on 2009-07-12

Merge Jay

1096. By Brian Aker <brian@gaz> on 2009-07-16

Merge Monty

1097. By Brian Aker <brian@gaz> on 2009-07-16

Merge Jay

1098. By Brian Aker <brian@gaz> on 2009-07-21

Merge Jay

[Jay Pipes (jaypipes)]

Merged into my captain branch...all tests pass. Looks good.

review: Approve

[lp:~posulliv/drizzle/info-schema-plugin]

1099. By Brian Aker <brian@gaz> on 2009-07-23

Mege Jay

=== modified file 'drizzled/info_schema.h'
--- drizzled/info_schema.h	2009-07-01 03:36:14 +0000
+++ drizzled/info_schema.h	2009-07-05 17:44:13 +0000
@@ -199,22 +199,6 @@
                         InfoSchemaTable *schema_table) const;
 };
 
-class StatusISMethods : public InfoSchemaMethods
-{
-public:
-  virtual int fillTable(Session *session, 
-                        TableList *tables,
-                        COND *cond);
-};
-
-class VariablesISMethods : public InfoSchemaMethods
-{
-public:
-  virtual int fillTable(Session *session, 
-                        TableList *tables,
-                        COND *cond);
-};
-
 /**
  * @class InfoSchemaTable
  * @brief 
 
=== modified file 'drizzled/show.cc'
--- drizzled/show.cc	2009-07-03 19:45:58 +0000
+++ drizzled/show.cc	2009-07-05 17:44:13 +0000
@@ -1005,6 +1005,11 @@
   }
 };
 
+SHOW_VAR *getFrontOfStatusVars()
+{
+  return all_status_vars.front();
+}
+
 /*
   Adds an array of SHOW_VAR entries to the output of SHOW STATUS
 
@@ -1143,172 +1148,6 @@
   }
 }
 
-inline void make_upper(char *buf)
-{
-  for (; *buf; buf++)
-    *buf= my_toupper(system_charset_info, *buf);
-}
-
-static bool show_status_array(Session *session, const char *wild,
-                              SHOW_VAR *variables,
-                              enum enum_var_type value_type,
-                              struct system_status_var *status_var,
-                              const char *prefix, Table *table,
-                              bool ucase_names)
-{
-  MY_ALIGNED_BYTE_ARRAY(buff_data, SHOW_VAR_FUNC_BUFF_SIZE, int64_t);
-  char * const buff= (char *) &buff_data;
-  char *prefix_end;
-  /* the variable name should not be longer than 64 characters */
-  char name_buffer[64];
-  int len;
-  SHOW_VAR tmp, *var;
-
-  prefix_end= strncpy(name_buffer, prefix, sizeof(name_buffer)-1);
-  prefix_end+= strlen(prefix);
-
-  if (*prefix)
-    *prefix_end++= '_';
-  len=name_buffer + sizeof(name_buffer) - prefix_end;
-
-  for (; variables->name; variables++)
-  {
-    strncpy(prefix_end, variables->name, len);
-    name_buffer[sizeof(name_buffer)-1]=0;       /* Safety */
-    if (ucase_names)
-      make_upper(name_buffer);
-
-    /*
-      if var->type is SHOW_FUNC, call the function.
-      Repeat as necessary, if new var is again SHOW_FUNC
-    */
-    for (var=variables; var->type == SHOW_FUNC; var= &tmp)
-      ((mysql_show_var_func)((st_show_var_func_container *)var->value)->func)(&tmp, buff);
-
-    SHOW_TYPE show_type=var->type;
-    if (show_type == SHOW_ARRAY)
-    {
-      show_status_array(session, wild, (SHOW_VAR *) var->value, value_type,
-                        status_var, name_buffer, table, ucase_names);
-    }
-    else
-    {
-      if (!(wild && wild[0] && wild_case_compare(system_charset_info,
-                                                 name_buffer, wild)))
-      {
-        char *value=var->value;
-        const char *pos, *end;                  // We assign a lot of const's
-        pthread_mutex_lock(&LOCK_global_system_variables);
-
-        if (show_type == SHOW_SYS)
-        {
-          show_type= ((sys_var*) value)->show_type();
-          value= (char*) ((sys_var*) value)->value_ptr(session, value_type,
-                                                       &null_lex_str);
-        }
-
-        pos= end= buff;
-        /*
-          note that value may be == buff. All SHOW_xxx code below
-          should still work in this case
-        */
-        switch (show_type) {
-        case SHOW_DOUBLE_STATUS:
-          value= ((char *) status_var + (ulong) value);
-          /* fall through */
-        case SHOW_DOUBLE:
-          /* 6 is the default precision for '%f' in sprintf() */
-          end= buff + my_fcvt(*(double *) value, 6, buff, NULL);
-          break;
-        case SHOW_LONG_STATUS:
-          value= ((char *) status_var + (ulong) value);
-          /* fall through */
-        case SHOW_LONG:
-          end= int10_to_str(*(long*) value, buff, 10);
-          break;
-        case SHOW_LONGLONG_STATUS:
-          value= ((char *) status_var + (uint64_t) value);
-          /* fall through */
-        case SHOW_LONGLONG:
-          end= int64_t10_to_str(*(int64_t*) value, buff, 10);
-          break;
-        case SHOW_SIZE:
-          {
-            stringstream ss (stringstream::in);
-            ss << *(size_t*) value;
-
-            string str= ss.str();
-            strncpy(buff, str.c_str(), str.length());
-            end= buff+ str.length();
-          }
-          break;
-        case SHOW_HA_ROWS:
-          end= int64_t10_to_str((int64_t) *(ha_rows*) value, buff, 10);
-          break;
-        case SHOW_BOOL:
-          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
-          break;
-        case SHOW_MY_BOOL:
-          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
-          break;
-        case SHOW_INT:
-        case SHOW_INT_NOFLUSH: // the difference lies in refresh_status()
-          end= int10_to_str((long) *(uint32_t*) value, buff, 10);
-          break;
-        case SHOW_HAVE:
-        {
-          SHOW_COMP_OPTION tmp_option= *(SHOW_COMP_OPTION *)value;
-          pos= show_comp_option_name[(int) tmp_option];
-          end= strchr(pos, '\0');
-          break;
-        }
-        case SHOW_CHAR:
-        {
-          if (!(pos= value))
-            pos= "";
-          end= strchr(pos, '\0');
-          break;
-        }
-       case SHOW_CHAR_PTR:
-        {
-          if (!(pos= *(char**) value))
-            pos= "";
-          end= strchr(pos, '\0');
-          break;
-        }
-        case SHOW_KEY_CACHE_LONG:
-          value= (char*) dflt_key_cache + (ulong)value;
-          end= int10_to_str(*(long*) value, buff, 10);
-          break;
-        case SHOW_KEY_CACHE_LONGLONG:
-          value= (char*) dflt_key_cache + (ulong)value;
-	  end= int64_t10_to_str(*(int64_t*) value, buff, 10);
-	  break;
-        case SHOW_UNDEF:
-          break;                                        // Return empty string
-        case SHOW_SYS:                                  // Cannot happen
-        default:
-          assert(0);
-          break;
-        }
-        table->restoreRecordAsDefault();
-        table->field[0]->store(name_buffer, strlen(name_buffer),
-                               system_charset_info);
-        table->field[1]->store(pos, (uint32_t) (end - pos), system_charset_info);
-        table->field[1]->set_notnull();
-
-        pthread_mutex_unlock(&LOCK_global_system_variables);
-
-        if (schema_table_store_record(session, table))
-          return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-
 /* collect status for all running threads */
 
 void calc_sum_of_all_status(STATUS_VAR *to)
@@ -1329,10 +1168,6 @@
   return;
 }
 
-
-/* This is only used internally, but we need it here as a forward reference */
-extern InfoSchemaTable schema_tables[];
-
 /*
   Store record to I_S table, convert HEAP table
   to MyISAM if necessary
@@ -1773,39 +1608,14 @@
 
 int schema_tables_add(Session *session, vector<LEX_STRING*> &files, const char *wild)
 {
-  InfoSchemaTable *tmp_schema_table= schema_tables;
-
-  for (; tmp_schema_table->getTableName().length() != 0; tmp_schema_table++)
-  {
-    if (tmp_schema_table->isHidden())
-    {
-      continue;
-    }
-
-    const string &schema_table_name= tmp_schema_table->getTableName();
-
-    if (wild && wild_case_compare(files_charset_info, schema_table_name.c_str(), wild))
-    {
-      continue;
-    }
-
-    LEX_STRING *file_name= 0;
-    file_name= session->make_lex_string(file_name, schema_table_name.c_str(),
-                                        schema_table_name.length(), true);
-    if (file_name == NULL)
-    {
-      return 1;
-    }
-
-    files.push_back(file_name);
-  }
-
   vector<InfoSchemaTable *>::iterator iter= find_if(all_schema_tables.begin(),
                                                     all_schema_tables.end(),
                                                     AddSchemaTable(session, files, wild));
 
   if (iter != all_schema_tables.end())
+  {
     return 1;
+  }
 
   return 0;
 }
@@ -2576,71 +2386,6 @@
 }
 
 
-int VariablesISMethods::fillTable(Session *session, TableList *tables, COND *)
-{
-  int res= 0;
-  LEX *lex= session->lex;
-  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
-  const string schema_table_name= tables->schema_table->getTableName();
-  enum enum_var_type option_type= OPT_SESSION;
-  bool upper_case_names= (schema_table_name.compare("VARIABLES") != 0);
-  bool sorted_vars= (schema_table_name.compare("VARIABLES") == 0);
-
-  if (lex->option_type == OPT_GLOBAL ||
-      schema_table_name.compare("GLOBAL_VARIABLES") == 0)
-  {
-    option_type= OPT_GLOBAL;
-  }
-
-  pthread_rwlock_rdlock(&LOCK_system_variables_hash);
-  res= show_status_array(session, wild, enumerate_sys_vars(session, sorted_vars),
-                         option_type, NULL, "", tables->table, upper_case_names);
-  pthread_rwlock_unlock(&LOCK_system_variables_hash);
-  return(res);
-}
-
-
-int StatusISMethods::fillTable(Session *session, TableList *tables, COND *)
-{
-  LEX *lex= session->lex;
-  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
-  int res= 0;
-  STATUS_VAR *tmp1, tmp;
-  const string schema_table_name= tables->schema_table->getTableName();
-  enum enum_var_type option_type;
-  bool upper_case_names= (schema_table_name.compare("STATUS") != 0);
-
-  if (schema_table_name.compare("STATUS") == 0)
-  {
-    option_type= lex->option_type;
-    if (option_type == OPT_GLOBAL)
-      tmp1= &tmp;
-    else
-      tmp1= session->initial_status_var;
-  }
-  else if (schema_table_name.compare("GLOBAL_STATUS") == 0)
-  {
-    option_type= OPT_GLOBAL;
-    tmp1= &tmp;
-  }
-  else
-  {
-    option_type= OPT_SESSION;
-    tmp1= &session->status_var;
-  }
-
-  pthread_mutex_lock(&LOCK_status);
-  if (option_type == OPT_GLOBAL)
-    calc_sum_of_all_status(&tmp);
-  res= show_status_array(session, wild,
-                         (SHOW_VAR *) all_status_vars.front(),
-                         option_type, tmp1, "", tables->table,
-                         upper_case_names);
-  pthread_mutex_unlock(&LOCK_status);
-  return(res);
-}
-
-
 class FindSchemaTableByName : public unary_function<InfoSchemaTable *, bool>
 {
   const char *table_name;
@@ -2670,21 +2415,14 @@
 
 InfoSchemaTable *find_schema_table(const char* table_name)
 {
-  InfoSchemaTable *schema_table= schema_tables;
-
-  for (; schema_table->getTableName().length() != 0; schema_table++)
-  {
-    if (! my_strcasecmp(system_charset_info,
-                        schema_table->getTableName().c_str(),
-                        table_name))
-      return(schema_table);
-  }
-
   vector<InfoSchemaTable *>::iterator iter= 
     find_if(all_schema_tables.begin(), all_schema_tables.end(),
             FindSchemaTableByName(table_name));
   if (iter != all_schema_tables.end())
+  {
     return *iter;
+  }
+
   return NULL;
 }
 
@@ -2997,51 +2735,3 @@
   session->no_warnings_for_error= 0;
   return(result);
 }
-
-ColumnInfo variables_fields_info[]=
-{
-  ColumnInfo("VARIABLE_NAME", 64, DRIZZLE_TYPE_VARCHAR, 0, 0, "Variable_name",
-   SKIP_OPEN_TABLE),
-  ColumnInfo("VARIABLE_VALUE", 16300, DRIZZLE_TYPE_VARCHAR, 0, 1, "Value", SKIP_OPEN_TABLE),
-  ColumnInfo()
-};
-
-
-static StatusISMethods status_methods;
-static VariablesISMethods variables_methods;
-
-static InfoSchemaTable global_stat_table("GLOBAL_STATUS",
-                                         variables_fields_info,
-                                         -1, -1, false, false, 0,
-                                         &status_methods);
-static InfoSchemaTable global_var_table("GLOBAL_VARIABLES",
-                                        variables_fields_info,
-                                        -1, -1, false, false, 0,
-                                        &variables_methods);
-static InfoSchemaTable sess_stat_table("SESSION_STATUS",
-                                       variables_fields_info,
-                                       -1, -1, false, false, 0,
-                                       &status_methods);
-static InfoSchemaTable sess_var_table("SESSION_VARIABLES",
-                                      variables_fields_info,
-                                      -1, -1, false, false, 0,
-                                      &variables_methods);
-static InfoSchemaTable status_table("STATUS",
-                                    variables_fields_info,
-                                    -1, -1, true, false, 0,
-                                    &status_methods);
-static InfoSchemaTable var_table("VARIABLES",
-                                 variables_fields_info,
-                                 -1, -1, true, false, 0,
-                                 &variables_methods);
-
-InfoSchemaTable schema_tables[]=
-{
-  global_stat_table,
-  global_var_table,
-  sess_stat_table,
-  sess_var_table,
-  status_table,
-  var_table,
-  InfoSchemaTable()
-};
 
=== modified file 'drizzled/show.h'
--- drizzled/show.h	2009-07-02 06:54:37 +0000
+++ drizzled/show.h	2009-07-05 17:44:13 +0000
@@ -65,6 +65,7 @@
                              LOOKUP_FIELD_VALUES *lookup_field_values);
 int make_db_list(Session *session, std::vector<LEX_STRING*> &files,
                  LOOKUP_FIELD_VALUES *lookup_field_vals, bool *with_i_schema);
+SHOW_VAR *getFrontOfStatusVars();
 
 int store_create_info(TableList *table_list, String *packet, HA_CREATE_INFO  *create_info_arg);
 bool store_db_create_info(const char *dbname, String *buffer, HA_CREATE_INFO *create_info);
 
=== modified file 'plugin/info_schema/info_schema.cc'
--- plugin/info_schema/info_schema.cc	2009-07-01 03:36:14 +0000
+++ plugin/info_schema/info_schema.cc	2009-07-05 17:44:13 +0000
@@ -48,6 +48,7 @@
 static vector<const ColumnInfo *> ref_constraint_columns;
 static vector<const ColumnInfo *> schemata_columns;
 static vector<const ColumnInfo *> stats_columns;
+static vector<const ColumnInfo *> status_columns;
 static vector<const ColumnInfo *> tab_constraints_columns;
 static vector<const ColumnInfo *> tables_columns;
 static vector<const ColumnInfo *> tab_names_columns;
@@ -66,9 +67,11 @@
 static InfoSchemaMethods *ref_constraint_methods= NULL;
 static InfoSchemaMethods *schemata_methods= NULL;
 static InfoSchemaMethods *stats_methods= NULL;
+static InfoSchemaMethods *status_methods= NULL;
 static InfoSchemaMethods *tab_constraints_methods= NULL;
 static InfoSchemaMethods *tables_methods= NULL;
 static InfoSchemaMethods *tab_names_methods= NULL;
+static InfoSchemaMethods *variables_methods= NULL;
 
 /*
  * I_S tables.
@@ -78,15 +81,21 @@
 static InfoSchemaTable *coll_char_set_table= NULL;
 static InfoSchemaTable *columns_table= NULL;
 static InfoSchemaTable *key_col_usage_table= NULL;
+static InfoSchemaTable *global_stat_table= NULL;
+static InfoSchemaTable *global_var_table= NULL;
 static InfoSchemaTable *open_tab_table= NULL;
 static InfoSchemaTable *plugins_table= NULL;
 static InfoSchemaTable *processlist_table= NULL;
 static InfoSchemaTable *ref_constraint_table= NULL;
 static InfoSchemaTable *schemata_table= NULL;
+static InfoSchemaTable *sess_stat_table= NULL;
+static InfoSchemaTable *sess_var_table= NULL;
 static InfoSchemaTable *stats_table= NULL;
+static InfoSchemaTable *status_table= NULL;
 static InfoSchemaTable *tab_constraints_table= NULL;
 static InfoSchemaTable *tables_table= NULL;
 static InfoSchemaTable *tab_names_table= NULL;
+static InfoSchemaTable *var_table= NULL;
 
 /**
  * Populate the vectors of columns for each I_S table.
@@ -152,6 +161,11 @@
     return true;
   }
 
+  if ((retval= createStatusColumns(status_columns)) == true)
+  {
+    return true;
+  }
+
   if ((retval= createTabConstraintsColumns(tab_constraints_columns)) == true)
   {
     return true;
@@ -186,6 +200,7 @@
   clearColumns(ref_constraint_columns);
   clearColumns(schemata_columns);
   clearColumns(stats_columns);
+  clearColumns(status_columns);
   clearColumns(tab_constraints_columns);
   clearColumns(tables_columns);
   clearColumns(tab_names_columns);
@@ -253,6 +268,11 @@
     return true;
   }
 
+  if ((status_methods= new(std::nothrow) StatusISMethods()) == NULL)
+  {
+    return true;
+  }
+
   if ((tab_constraints_methods= new(std::nothrow) TabConstraintsISMethods()) == NULL)
   {
     return true;
@@ -268,6 +288,11 @@
     return true;
   }
 
+  if ((variables_methods= new(std::nothrow) VariablesISMethods()) == NULL)
+  {
+    return true;
+  }
+
   return false;
 }
 
@@ -287,9 +312,11 @@
   delete ref_constraint_methods;
   delete schemata_methods;
   delete stats_methods;
+  delete status_methods;
   delete tab_constraints_methods;
   delete tables_methods;
   delete tab_names_methods;
+  delete variables_methods;
 }
 
 /**
@@ -347,6 +374,24 @@
     return true;
   }
 
+  global_stat_table= new(std::nothrow) InfoSchemaTable("GLOBAL_STATUS",
+                                                       status_columns,
+                                                       -1, -1, false, false,
+                                                       0, status_methods);
+  if (global_stat_table == NULL)
+  {
+    return true;
+  }
+
+  global_var_table= new(std::nothrow) InfoSchemaTable("GLOBAL_VARIABLES",
+                                                      status_columns,
+                                                      -1, -1, false, false,
+                                                      0, variables_methods);
+  if (global_var_table == NULL)
+  {
+    return true;
+  }
+  
   open_tab_table= new(std::nothrow) InfoSchemaTable("OPEN_TABLES",
                                                     open_tab_columns,
                                                     -1, -1, true, false, 0,
@@ -393,6 +438,24 @@
     return true;
   }
 
+  sess_stat_table= new(std::nothrow) InfoSchemaTable("SESSION_STATUS",
+                                                     status_columns,
+                                                     -1, -1, false, false,
+                                                     0, status_methods);
+  if (sess_stat_table == NULL)
+  {
+    return true;
+  }
+
+  sess_var_table= new(std::nothrow) InfoSchemaTable("SESSION_VARIABLES",
+                                                    status_columns,
+                                                    -1, -1, false, false, 0,
+                                                    variables_methods);
+  if (sess_var_table == NULL)
+  {
+    return true;
+  }
+
   stats_table= new(std::nothrow) InfoSchemaTable("STATISTICS",
                                                  stats_columns,
                                                  1, 2, false, true,
@@ -403,6 +466,15 @@
     return true;
   }
 
+  status_table= new(std::nothrow) InfoSchemaTable("STATUS",
+                                                  status_columns,
+                                                  -1, -1, true, false, 0,
+                                                  status_methods);
+  if (status_table == NULL)
+  {
+    return true;
+  }
+
   tab_constraints_table= new(std::nothrow) InfoSchemaTable("TABLE_CONSTRAINTS",
                                                            tab_constraints_columns,
                                                            3, 4, false, true,
@@ -432,6 +504,15 @@
     return true;
   }
 
+  var_table= new(std::nothrow) InfoSchemaTable("VARIABLES",
+                                               status_columns,
+                                               -1, -1, true, false, 0,
+                                               variables_methods);
+  if (var_table == NULL)
+  {
+    return true;
+  }
+
   return false;
 }
 
@@ -445,15 +526,21 @@
   delete coll_char_set_table;
   delete columns_table;
   delete key_col_usage_table;
+  delete global_stat_table;
+  delete global_var_table;
   delete open_tab_table;
   delete plugins_table;
   delete processlist_table;
   delete ref_constraint_table;
   delete schemata_table;
+  delete sess_stat_table;
+  delete sess_var_table;
   delete stats_table;
+  delete status_table;
   delete tab_constraints_table;
   delete tables_table;
   delete tab_names_table;
+  delete var_table;
 }
 
 /**
@@ -486,15 +573,21 @@
   registry.add(coll_char_set_table);
   registry.add(columns_table);
   registry.add(key_col_usage_table);
+  registry.add(global_stat_table);
+  registry.add(global_var_table);
   registry.add(open_tab_table);
   registry.add(plugins_table);
   registry.add(processlist_table);
   registry.add(ref_constraint_table);
   registry.add(schemata_table);
+  registry.add(sess_stat_table);
+  registry.add(sess_var_table);
   registry.add(stats_table);
+  registry.add(status_table);
   registry.add(tab_constraints_table);
   registry.add(tables_table);
   registry.add(tab_names_table);
+  registry.add(var_table);
 
   return 0;
 }
@@ -512,15 +605,21 @@
   registry.remove(coll_char_set_table);
   registry.remove(columns_table);
   registry.remove(key_col_usage_table);
+  registry.remove(global_stat_table);
+  registry.remove(global_var_table);
   registry.remove(open_tab_table);
   registry.remove(plugins_table);
   registry.remove(processlist_table);
   registry.remove(ref_constraint_table);
   registry.remove(schemata_table);
+  registry.remove(sess_stat_table);
+  registry.remove(sess_var_table);
   registry.remove(stats_table);
+  registry.remove(status_table);
   registry.remove(tab_constraints_table);
   registry.remove(tables_table);
   registry.remove(tab_names_table);
+  registry.remove(var_table);
 
   cleanupTableMethods();
   cleanupTableColumns();
 
=== modified file 'plugin/info_schema/info_schema_columns.cc'
--- plugin/info_schema/info_schema_columns.cc	2009-07-01 03:36:14 +0000
+++ plugin/info_schema/info_schema_columns.cc	2009-07-05 17:26:20 +0000
@@ -1384,6 +1384,38 @@
   return false;
 }
 
+bool createStatusColumns(vector<const ColumnInfo *>& cols)
+{
+  const ColumnInfo *name= new(std::nothrow) ColumnInfo("VARIABLE_NAME",
+                                                       64,
+                                                       DRIZZLE_TYPE_VARCHAR,
+                                                       0,
+                                                       0,
+                                                       "Variable_name",
+                                                       SKIP_OPEN_TABLE);
+  if (name == NULL)
+  {
+    return true;
+  }
+
+  const ColumnInfo *value= new(std::nothrow) ColumnInfo("VARIABLE_VALUE",
+                                                        16300,
+                                                        DRIZZLE_TYPE_VARCHAR,
+                                                        0,
+                                                        1,
+                                                        "Value",
+                                                        SKIP_OPEN_TABLE);
+  if (value == NULL)
+  {
+    return true;
+  }
+
+  cols.push_back(name);
+  cols.push_back(value);
+
+  return false;
+}
+
 bool createTabConstraintsColumns(vector<const ColumnInfo *>& cols)
 {
   const ColumnInfo *cat= new(std::nothrow) ColumnInfo("CONSTRAINT_CATALOG",
 
=== modified file 'plugin/info_schema/info_schema_columns.h'
--- plugin/info_schema/info_schema_columns.h	2009-07-01 03:36:14 +0000
+++ plugin/info_schema/info_schema_columns.h	2009-07-05 17:26:20 +0000
@@ -130,6 +130,15 @@
 bool createStatsColumns(std::vector<const ColumnInfo *>& cols);
 
 /**
+ * Create the various volumns for numerous I_S tables 
+ * and add them to the std::vector of columns for these table.
+ *
+ * @param[out] cols vector to add columns to
+ * @return false on success; true on failure
+ */
+bool createStatusColumns(std::vector<const ColumnInfo *>& cols);
+
+/**
  * Create the various volumns for the TABLE_CONSTRAINTS I_S table 
  * and add them to the std::vector of columns for this table.
  *
 
=== modified file 'plugin/info_schema/info_schema_methods.cc'
--- plugin/info_schema/info_schema_methods.cc	2009-07-02 06:54:37 +0000
+++ plugin/info_schema/info_schema_methods.cc	2009-07-05 17:44:13 +0000
@@ -36,6 +36,171 @@
 
 using namespace std;
 
+static inline void make_upper(char *buf)
+{
+  for (; *buf; buf++)
+    *buf= my_toupper(system_charset_info, *buf);
+}
+
+static bool show_status_array(Session *session, const char *wild,
+                              SHOW_VAR *variables,
+                              enum enum_var_type value_type,
+                              struct system_status_var *status_var,
+                              const char *prefix, Table *table,
+                              bool ucase_names)
+{
+  MY_ALIGNED_BYTE_ARRAY(buff_data, SHOW_VAR_FUNC_BUFF_SIZE, int64_t);
+  char * const buff= (char *) &buff_data;
+  char *prefix_end;
+  /* the variable name should not be longer than 64 characters */
+  char name_buffer[64];
+  int len;
+  SHOW_VAR tmp, *var;
+
+  prefix_end= strncpy(name_buffer, prefix, sizeof(name_buffer)-1);
+  prefix_end+= strlen(prefix);
+
+  if (*prefix)
+    *prefix_end++= '_';
+  len=name_buffer + sizeof(name_buffer) - prefix_end;
+
+  for (; variables->name; variables++)
+  {
+    strncpy(prefix_end, variables->name, len);
+    name_buffer[sizeof(name_buffer)-1]=0;       /* Safety */
+    if (ucase_names)
+      make_upper(name_buffer);
+
+    /*
+      if var->type is SHOW_FUNC, call the function.
+      Repeat as necessary, if new var is again SHOW_FUNC
+    */
+    for (var=variables; var->type == SHOW_FUNC; var= &tmp)
+      ((mysql_show_var_func)((st_show_var_func_container *)var->value)->func)(&tmp, buff);
+
+    SHOW_TYPE show_type=var->type;
+    if (show_type == SHOW_ARRAY)
+    {
+      show_status_array(session, wild, (SHOW_VAR *) var->value, value_type,
+                        status_var, name_buffer, table, ucase_names);
+    }
+    else
+    {
+      if (!(wild && wild[0] && wild_case_compare(system_charset_info,
+                                                 name_buffer, wild)))
+      {
+        char *value=var->value;
+        const char *pos, *end;                  // We assign a lot of const's
+        pthread_mutex_lock(&LOCK_global_system_variables);
+
+        if (show_type == SHOW_SYS)
+        {
+          show_type= ((sys_var*) value)->show_type();
+          value= (char*) ((sys_var*) value)->value_ptr(session, value_type,
+                                                       &null_lex_str);
+        }
+
+        pos= end= buff;
+        /*
+          note that value may be == buff. All SHOW_xxx code below
+          should still work in this case
+        */
+        switch (show_type) {
+        case SHOW_DOUBLE_STATUS:
+          value= ((char *) status_var + (ulong) value);
+          /* fall through */
+        case SHOW_DOUBLE:
+          /* 6 is the default precision for '%f' in sprintf() */
+          end= buff + my_fcvt(*(double *) value, 6, buff, NULL);
+          break;
+        case SHOW_LONG_STATUS:
+          value= ((char *) status_var + (ulong) value);
+          /* fall through */
+        case SHOW_LONG:
+          end= int10_to_str(*(long*) value, buff, 10);
+          break;
+        case SHOW_LONGLONG_STATUS:
+          value= ((char *) status_var + (uint64_t) value);
+          /* fall through */
+        case SHOW_LONGLONG:
+          end= int64_t10_to_str(*(int64_t*) value, buff, 10);
+          break;
+        case SHOW_SIZE:
+          {
+            stringstream ss (stringstream::in);
+            ss << *(size_t*) value;
+
+            string str= ss.str();
+            strncpy(buff, str.c_str(), str.length());
+            end= buff+ str.length();
+          }
+          break;
+        case SHOW_HA_ROWS:
+          end= int64_t10_to_str((int64_t) *(ha_rows*) value, buff, 10);
+          break;
+        case SHOW_BOOL:
+          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
+          break;
+        case SHOW_MY_BOOL:
+          end+= sprintf(buff,"%s", *(bool*) value ? "ON" : "OFF");
+          break;
+        case SHOW_INT:
+        case SHOW_INT_NOFLUSH: // the difference lies in refresh_status()
+          end= int10_to_str((long) *(uint32_t*) value, buff, 10);
+          break;
+        case SHOW_HAVE:
+        {
+          SHOW_COMP_OPTION tmp_option= *(SHOW_COMP_OPTION *)value;
+          pos= show_comp_option_name[(int) tmp_option];
+          end= strchr(pos, '\0');
+          break;
+        }
+        case SHOW_CHAR:
+        {
+          if (!(pos= value))
+            pos= "";
+          end= strchr(pos, '\0');
+          break;
+        }
+       case SHOW_CHAR_PTR:
+        {
+          if (!(pos= *(char**) value))
+            pos= "";
+          end= strchr(pos, '\0');
+          break;
+        }
+        case SHOW_KEY_CACHE_LONG:
+          value= (char*) dflt_key_cache + (ulong)value;
+          end= int10_to_str(*(long*) value, buff, 10);
+          break;
+        case SHOW_KEY_CACHE_LONGLONG:
+          value= (char*) dflt_key_cache + (ulong)value;
+	  end= int64_t10_to_str(*(int64_t*) value, buff, 10);
+	  break;
+        case SHOW_UNDEF:
+          break;                                        // Return empty string
+        case SHOW_SYS:                                  // Cannot happen
+        default:
+          assert(0);
+          break;
+        }
+        table->restoreRecordAsDefault();
+        table->field[0]->store(name_buffer, strlen(name_buffer),
+                               system_charset_info);
+        table->field[1]->store(pos, (uint32_t) (end - pos), system_charset_info);
+        table->field[1]->set_notnull();
+
+        pthread_mutex_unlock(&LOCK_global_system_variables);
+
+        if (schema_table_store_record(session, table))
+          return true;
+      }
+    }
+  }
+
+  return false;
+}
+
 int CharSetISMethods::fillTable(Session *session, TableList *tables, COND *)
 {
   CHARSET_INFO **cs;
@@ -786,6 +951,46 @@
   return(res);
 }
 
+int StatusISMethods::fillTable(Session *session, TableList *tables, COND *)
+{
+  LEX *lex= session->lex;
+  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
+  int res= 0;
+  STATUS_VAR *tmp1, tmp;
+  const string schema_table_name= tables->schema_table->getTableName();
+  enum enum_var_type option_type;
+  bool upper_case_names= (schema_table_name.compare("STATUS") != 0);
+
+  if (schema_table_name.compare("STATUS") == 0)
+  {
+    option_type= lex->option_type;
+    if (option_type == OPT_GLOBAL)
+      tmp1= &tmp;
+    else
+      tmp1= session->initial_status_var;
+  }
+  else if (schema_table_name.compare("GLOBAL_STATUS") == 0)
+  {
+    option_type= OPT_GLOBAL;
+    tmp1= &tmp;
+  }
+  else
+  {
+    option_type= OPT_SESSION;
+    tmp1= &session->status_var;
+  }
+
+  pthread_mutex_lock(&LOCK_status);
+  if (option_type == OPT_GLOBAL)
+    calc_sum_of_all_status(&tmp);
+  res= show_status_array(session, wild,
+                         getFrontOfStatusVars(),
+                         option_type, tmp1, "", tables->table,
+                         upper_case_names);
+  pthread_mutex_unlock(&LOCK_status);
+  return(res);
+}
+
 static bool store_constraints(Session *session, Table *table, LEX_STRING *db_name,
                               LEX_STRING *table_name, const char *key_name,
                               uint32_t key_len, const char *con_type, uint32_t con_len)
@@ -1118,3 +1323,27 @@
   }
   return 0;
 }
+
+int VariablesISMethods::fillTable(Session *session, TableList *tables, COND *)
+{
+  int res= 0;
+  LEX *lex= session->lex;
+  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
+  const string schema_table_name= tables->schema_table->getTableName();
+  enum enum_var_type option_type= OPT_SESSION;
+  bool upper_case_names= (schema_table_name.compare("VARIABLES") != 0);
+  bool sorted_vars= (schema_table_name.compare("VARIABLES") == 0);
+
+  if (lex->option_type == OPT_GLOBAL ||
+      schema_table_name.compare("GLOBAL_VARIABLES") == 0)
+  {
+    option_type= OPT_GLOBAL;
+  }
+
+  pthread_rwlock_rdlock(&LOCK_system_variables_hash);
+  res= show_status_array(session, wild, enumerate_sys_vars(session, sorted_vars),
+                         option_type, NULL, "", tables->table, upper_case_names);
+  pthread_rwlock_unlock(&LOCK_system_variables_hash);
+  return(res);
+}
+
 
=== modified file 'plugin/info_schema/info_schema_methods.h'
--- plugin/info_schema/info_schema_methods.h	2009-07-01 03:36:14 +0000
+++ plugin/info_schema/info_schema_methods.h	2009-07-05 17:44:13 +0000
@@ -192,6 +192,20 @@
 };
 
 /**
+ * @class StatusISMethods
+ * @brief
+ *   Class which implements any methods that the STATUS
+ *   I_S table needs besides the default methods
+ */
+class StatusISMethods : public InfoSchemaMethods
+{
+public:
+  virtual int fillTable(Session *session, 
+                        TableList *tables,
+                        COND *cond);
+};
+
+/**
  * @class TabConstraintsISMethods
  * @brief
  *   Class which implements any methods that the TABLE_CONSTRAINTS
@@ -231,4 +245,18 @@
   virtual int oldFormat(Session *session, InfoSchemaTable *schema_table) const;
 };
 
+/**
+ * @class VariablesISMethods
+ * @brief
+ *   Class which implements any methods that the VARIABLES
+ *   I_S table needs besides the default methods
+ */
+class VariablesISMethods : public InfoSchemaMethods
+{
+public:
+  virtual int fillTable(Session *session, 
+                        TableList *tables,
+                        COND *cond);
+};
+
 #endif /* DRIZZLE_INFO_SCHEMA_METHODS_H */
 
=== modified file 'tests/r/information_schema.result'
--- tests/r/information_schema.result	2009-07-01 03:38:19 +0000
+++ tests/r/information_schema.result	2009-07-05 18:46:45 +0000
@@ -244,10 +244,6 @@
         )
 AND t.table_name NOT LIKE 'falcon%';
 table_name	column_name
-GLOBAL_STATUS	VARIABLE_NAME
-GLOBAL_VARIABLES	VARIABLE_NAME
-SESSION_STATUS	VARIABLE_NAME
-SESSION_VARIABLES	VARIABLE_NAME
 INNODB_TRX	trx_id
 INNODB_LOCKS	lock_id
 INNODB_LOCK_WAITS	requesting_trx_id
@@ -260,10 +256,14 @@
 COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+GLOBAL_STATUS	VARIABLE_NAME
+GLOBAL_VARIABLES	VARIABLE_NAME
 PLUGINS	PLUGIN_NAME
 PROCESSLIST	ID
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
 SCHEMATA	SCHEMA_NAME
+SESSION_STATUS	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_NAME
 STATISTICS	TABLE_SCHEMA
 TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
 TABLES	TABLE_SCHEMA
@@ -283,10 +283,6 @@
         )
 AND t.table_name NOT LIKE 'falcon%';
 table_name	column_name
-GLOBAL_STATUS	VARIABLE_NAME
-GLOBAL_VARIABLES	VARIABLE_NAME
-SESSION_STATUS	VARIABLE_NAME
-SESSION_VARIABLES	VARIABLE_NAME
 INNODB_TRX	trx_id
 INNODB_LOCKS	lock_id
 INNODB_LOCK_WAITS	requesting_trx_id
@@ -299,10 +295,14 @@
 COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+GLOBAL_STATUS	VARIABLE_NAME
+GLOBAL_VARIABLES	VARIABLE_NAME
 PLUGINS	PLUGIN_NAME
 PROCESSLIST	ID
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
 SCHEMATA	SCHEMA_NAME
+SESSION_STATUS	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_NAME
 STATISTICS	TABLE_SCHEMA
 TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
 TABLES	TABLE_SCHEMA
@@ -465,151 +465,156 @@
 FROM information_schema.processlist
 WHERE id = CONNECTION_ID()	Query	test
 SELECT *
-FROM information_schema.character_sets;
+FROM information_schema.character_sets
+ORDER BY character_set_name;
 CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
+binary	binary		1
 utf8	utf8_general_ci	UTF-8 Unicode	4
-binary	binary		1
 SELECT *
-FROM information_schema.collations;
+FROM information_schema.collations
+ORDER BY collation_name;
 COLLATION_NAME	CHARACTER_SET_NAME	DESCRIPTION	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
+binary	binary	63	0	Yes	1	0
+utf8_bin	utf8	46	0	Yes	1	0
+utf8_czech_ci	utf8	234	0	Yes	8	0
+utf8_danish_ci	utf8	235	0	Yes	8	0
+utf8_esperanto_ci	utf8	241	0	Yes	8	0
+utf8_estonian_ci	utf8	230	0	Yes	8	0
 utf8_general_ci	utf8	45	0	Yes	1	0
-utf8_bin	utf8	46	0	Yes	1	0
-utf8_unicode_ci	utf8	224	0	Yes	8	0
+utf8_hungarian_ci	utf8	242	0	Yes	8	0
 utf8_icelandic_ci	utf8	225	0	Yes	8	0
 utf8_latvian_ci	utf8	226	0	Yes	8	0
+utf8_lithuanian_ci	utf8	236	0	Yes	8	0
+utf8_persian_ci	utf8	240	0	Yes	8	0
+utf8_polish_ci	utf8	229	0	Yes	8	0
 utf8_romanian_ci	utf8	227	0	Yes	8	0
+utf8_roman_ci	utf8	239	0	Yes	8	0
+utf8_sinhala_ci	utf8	243	0	Yes	8	0
+utf8_slovak_ci	utf8	237	0	Yes	8	0
 utf8_slovenian_ci	utf8	228	0	Yes	8	0
-utf8_polish_ci	utf8	229	0	Yes	8	0
-utf8_estonian_ci	utf8	230	0	Yes	8	0
+utf8_spanish2_ci	utf8	238	0	Yes	8	0
 utf8_spanish_ci	utf8	231	0	Yes	8	0
 utf8_swedish_ci	utf8	232	0	Yes	8	0
 utf8_turkish_ci	utf8	233	0	Yes	8	0
-utf8_czech_ci	utf8	234	0	Yes	8	0
-utf8_danish_ci	utf8	235	0	Yes	8	0
-utf8_lithuanian_ci	utf8	236	0	Yes	8	0
-utf8_slovak_ci	utf8	237	0	Yes	8	0
-utf8_spanish2_ci	utf8	238	0	Yes	8	0
-utf8_roman_ci	utf8	239	0	Yes	8	0
-utf8_persian_ci	utf8	240	0	Yes	8	0
-utf8_esperanto_ci	utf8	241	0	Yes	8	0
-utf8_hungarian_ci	utf8	242	0	Yes	8	0
-utf8_sinhala_ci	utf8	243	0	Yes	8	0
-binary	binary	63	0	Yes	1	0
+utf8_unicode_ci	utf8	224	0	Yes	8	0
 SELECT * 
-FROM information_schema.collation_character_set_applicability;
+FROM information_schema.collation_character_set_applicability
+ORDER BY collation_name;
 COLLATION_NAME	CHARACTER_SET_NAME
+binary	binary
+utf8_bin	utf8
+utf8_czech_ci	utf8
+utf8_danish_ci	utf8
+utf8_esperanto_ci	utf8
+utf8_estonian_ci	utf8
 utf8_general_ci	utf8
-utf8_bin	utf8
-utf8_unicode_ci	utf8
+utf8_hungarian_ci	utf8
 utf8_icelandic_ci	utf8
 utf8_latvian_ci	utf8
+utf8_lithuanian_ci	utf8
+utf8_persian_ci	utf8
+utf8_polish_ci	utf8
 utf8_romanian_ci	utf8
+utf8_roman_ci	utf8
+utf8_sinhala_ci	utf8
+utf8_slovak_ci	utf8
 utf8_slovenian_ci	utf8
-utf8_polish_ci	utf8
-utf8_estonian_ci	utf8
+utf8_spanish2_ci	utf8
 utf8_spanish_ci	utf8
 utf8_swedish_ci	utf8
 utf8_turkish_ci	utf8
-utf8_czech_ci	utf8
-utf8_danish_ci	utf8
-utf8_lithuanian_ci	utf8
-utf8_slovak_ci	utf8
-utf8_spanish2_ci	utf8
-utf8_roman_ci	utf8
-utf8_persian_ci	utf8
-utf8_esperanto_ci	utf8
-utf8_hungarian_ci	utf8
-utf8_sinhala_ci	utf8
-binary	binary
+utf8_unicode_ci	utf8
 SELECT table_name, column_name
-FROM information_schema.columns;
+FROM information_schema.columns
+ORDER BY table_name;
 table_name	column_name
-GLOBAL_STATUS	VARIABLE_NAME
-GLOBAL_STATUS	VARIABLE_VALUE
-GLOBAL_VARIABLES	VARIABLE_NAME
-GLOBAL_VARIABLES	VARIABLE_VALUE
-SESSION_STATUS	VARIABLE_NAME
-SESSION_STATUS	VARIABLE_VALUE
-SESSION_VARIABLES	VARIABLE_NAME
-SESSION_VARIABLES	VARIABLE_VALUE
-INNODB_TRX	trx_id
-INNODB_TRX	trx_state
-INNODB_TRX	trx_started
-INNODB_TRX	trx_requested_lock_id
-INNODB_TRX	trx_wait_started
-INNODB_TRX	trx_weight
-INNODB_TRX	trx_mysql_thread_id
-INNODB_TRX	trx_query
-INNODB_LOCKS	lock_id
-INNODB_LOCKS	lock_trx_id
-INNODB_LOCKS	lock_mode
-INNODB_LOCKS	lock_type
-INNODB_LOCKS	lock_table
-INNODB_LOCKS	lock_index
-INNODB_LOCKS	lock_space
-INNODB_LOCKS	lock_page
-INNODB_LOCKS	lock_rec
-INNODB_LOCKS	lock_data
-INNODB_LOCK_WAITS	requesting_trx_id
-INNODB_LOCK_WAITS	requested_lock_id
-INNODB_LOCK_WAITS	blocking_trx_id
-INNODB_LOCK_WAITS	blocking_lock_id
-INNODB_CMP	page_size
-INNODB_CMP	compress_ops
-INNODB_CMP	compress_ops_ok
-INNODB_CMP	compress_time
-INNODB_CMP	uncompress_ops
-INNODB_CMP	uncompress_time
-INNODB_CMP_RESET	page_size
-INNODB_CMP_RESET	compress_ops
-INNODB_CMP_RESET	compress_ops_ok
-INNODB_CMP_RESET	compress_time
-INNODB_CMP_RESET	uncompress_ops
-INNODB_CMP_RESET	uncompress_time
-INNODB_CMPMEM	page_size
-INNODB_CMPMEM	pages_used
-INNODB_CMPMEM	pages_free
-INNODB_CMPMEM	relocation_ops
-INNODB_CMPMEM	relocation_time
-INNODB_CMPMEM_RESET	page_size
-INNODB_CMPMEM_RESET	pages_used
-INNODB_CMPMEM_RESET	pages_free
-INNODB_CMPMEM_RESET	relocation_ops
-INNODB_CMPMEM_RESET	relocation_time
-CHARACTER_SETS	CHARACTER_SET_NAME
+CHARACTER_SETS	MAXLEN
+CHARACTER_SETS	DESCRIPTION
 CHARACTER_SETS	DEFAULT_COLLATE_NAME
-CHARACTER_SETS	DESCRIPTION
-CHARACTER_SETS	MAXLEN
-COLLATIONS	COLLATION_NAME
-COLLATIONS	CHARACTER_SET_NAME
-COLLATIONS	DESCRIPTION
-COLLATIONS	ID
-COLLATIONS	IS_DEFAULT
+CHARACTER_SETS	CHARACTER_SET_NAME
 COLLATIONS	IS_COMPILED
+COLLATIONS	COLLATION_NAME
 COLLATIONS	SORTLEN
-COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
+COLLATIONS	IS_DEFAULT
+COLLATIONS	ID
+COLLATIONS	DESCRIPTION
+COLLATIONS	CHARACTER_SET_NAME
 COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME
+COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
+COLUMNS	PRIVILEGES
+COLUMNS	TABLE_SCHEMA
+COLUMNS	TABLE_NAME
 COLUMNS	TABLE_CATALOG
-COLUMNS	TABLE_SCHEMA
-COLUMNS	TABLE_NAME
 COLUMNS	COLUMN_NAME
 COLUMNS	ORDINAL_POSITION
 COLUMNS	COLUMN_DEFAULT
 COLUMNS	IS_NULLABLE
-COLUMNS	DATA_TYPE
-COLUMNS	CHARACTER_MAXIMUM_LENGTH
-COLUMNS	CHARACTER_OCTET_LENGTH
-COLUMNS	NUMERIC_PRECISION
-COLUMNS	NUMERIC_SCALE
+COLUMNS	FORMAT
+COLUMNS	COLLATION_NAME
 COLUMNS	CHARACTER_SET_NAME
-COLUMNS	COLLATION_NAME
+COLUMNS	COLUMN_COMMENT
 COLUMNS	COLUMN_TYPE
 COLUMNS	COLUMN_KEY
 COLUMNS	EXTRA
-COLUMNS	PRIVILEGES
-COLUMNS	COLUMN_COMMENT
 COLUMNS	STORAGE
-COLUMNS	FORMAT
+COLUMNS	NUMERIC_SCALE
+COLUMNS	NUMERIC_PRECISION
+COLUMNS	CHARACTER_OCTET_LENGTH
+COLUMNS	DATA_TYPE
+COLUMNS	CHARACTER_MAXIMUM_LENGTH
+GLOBAL_STATUS	VARIABLE_NAME
+GLOBAL_STATUS	VARIABLE_VALUE
+GLOBAL_VARIABLES	VARIABLE_VALUE
+GLOBAL_VARIABLES	VARIABLE_NAME
+INNODB_CMP	compress_time
+INNODB_CMP	uncompress_ops
+INNODB_CMP	compress_ops
+INNODB_CMP	page_size
+INNODB_CMP	uncompress_time
+INNODB_CMP	compress_ops_ok
+INNODB_CMPMEM	relocation_time
+INNODB_CMPMEM	relocation_ops
+INNODB_CMPMEM	pages_used
+INNODB_CMPMEM	page_size
+INNODB_CMPMEM	pages_free
+INNODB_CMPMEM_RESET	relocation_time
+INNODB_CMPMEM_RESET	relocation_ops
+INNODB_CMPMEM_RESET	pages_free
+INNODB_CMPMEM_RESET	pages_used
+INNODB_CMPMEM_RESET	page_size
+INNODB_CMP_RESET	page_size
+INNODB_CMP_RESET	compress_ops
+INNODB_CMP_RESET	compress_ops_ok
+INNODB_CMP_RESET	compress_time
+INNODB_CMP_RESET	uncompress_ops
+INNODB_CMP_RESET	uncompress_time
+INNODB_LOCKS	lock_index
+INNODB_LOCKS	lock_table
+INNODB_LOCKS	lock_type
+INNODB_LOCKS	lock_trx_id
+INNODB_LOCKS	lock_id
+INNODB_LOCKS	lock_mode
+INNODB_LOCKS	lock_space
+INNODB_LOCKS	lock_page
+INNODB_LOCKS	lock_rec
+INNODB_LOCKS	lock_data
+INNODB_LOCK_WAITS	blocking_lock_id
+INNODB_LOCK_WAITS	blocking_trx_id
+INNODB_LOCK_WAITS	requested_lock_id
+INNODB_LOCK_WAITS	requesting_trx_id
+INNODB_TRX	trx_id
+INNODB_TRX	trx_state
+INNODB_TRX	trx_started
+INNODB_TRX	trx_requested_lock_id
+INNODB_TRX	trx_wait_started
+INNODB_TRX	trx_weight
+INNODB_TRX	trx_mysql_thread_id
+INNODB_TRX	trx_query
+KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME
+KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME
+KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA
+KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT
+KEY_COLUMN_USAGE	ORDINAL_POSITION
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 KEY_COLUMN_USAGE	CONSTRAINT_NAME
@@ -617,50 +622,40 @@
 KEY_COLUMN_USAGE	TABLE_SCHEMA
 KEY_COLUMN_USAGE	TABLE_NAME
 KEY_COLUMN_USAGE	COLUMN_NAME
-KEY_COLUMN_USAGE	ORDINAL_POSITION
-KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT
-KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA
-KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME
-KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME
-PLUGINS	PLUGIN_NAME
+PLUGINS	PLUGIN_LICENSE
+PLUGINS	PLUGIN_DESCRIPTION
+PLUGINS	PLUGIN_AUTHOR
+PLUGINS	PLUGIN_STATUS
 PLUGINS	PLUGIN_VERSION
-PLUGINS	PLUGIN_STATUS
-PLUGINS	PLUGIN_AUTHOR
-PLUGINS	PLUGIN_DESCRIPTION
-PLUGINS	PLUGIN_LICENSE
-PROCESSLIST	ID
+PLUGINS	PLUGIN_NAME
+PROCESSLIST	INFO
+PROCESSLIST	STATE
+PROCESSLIST	TIME
+PROCESSLIST	COMMAND
+PROCESSLIST	DB
+PROCESSLIST	HOST
 PROCESSLIST	USER
-PROCESSLIST	HOST
-PROCESSLIST	DB
-PROCESSLIST	COMMAND
-PROCESSLIST	TIME
-PROCESSLIST	STATE
-PROCESSLIST	INFO
+PROCESSLIST	ID
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME
+REFERENTIAL_CONSTRAINTS	TABLE_NAME
+REFERENTIAL_CONSTRAINTS	DELETE_RULE
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
-REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA
-REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME
-REFERENTIAL_CONSTRAINTS	MATCH_OPTION
-REFERENTIAL_CONSTRAINTS	UPDATE_RULE
-REFERENTIAL_CONSTRAINTS	DELETE_RULE
-REFERENTIAL_CONSTRAINTS	TABLE_NAME
-REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME
+SCHEMATA	SQL_PATH
+SCHEMATA	DEFAULT_COLLATION_NAME
+SCHEMATA	DEFAULT_CHARACTER_SET_NAME
+SCHEMATA	SCHEMA_NAME
 SCHEMATA	CATALOG_NAME
-SCHEMATA	SCHEMA_NAME
-SCHEMATA	DEFAULT_CHARACTER_SET_NAME
-SCHEMATA	DEFAULT_COLLATION_NAME
-SCHEMATA	SQL_PATH
-STATISTICS	TABLE_CATALOG
-STATISTICS	TABLE_SCHEMA
-STATISTICS	TABLE_NAME
-STATISTICS	NON_UNIQUE
-STATISTICS	INDEX_SCHEMA
-STATISTICS	INDEX_NAME
-STATISTICS	SEQ_IN_INDEX
-STATISTICS	COLUMN_NAME
-STATISTICS	COLLATION
+SESSION_STATUS	VARIABLE_VALUE
+SESSION_STATUS	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_NAME
+SESSION_VARIABLES	VARIABLE_VALUE
 STATISTICS	CARDINALITY
 STATISTICS	SUB_PART
 STATISTICS	PACKED
@@ -668,20 +663,15 @@
 STATISTICS	INDEX_TYPE
 STATISTICS	COMMENT
 STATISTICS	INDEX_COMMENT
-TABLE_CONSTRAINTS	CONSTRAINT_CATALOG
-TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
-TABLE_CONSTRAINTS	CONSTRAINT_NAME
-TABLE_CONSTRAINTS	TABLE_SCHEMA
-TABLE_CONSTRAINTS	TABLE_NAME
-TABLE_CONSTRAINTS	CONSTRAINT_TYPE
-TABLES	TABLE_CATALOG
-TABLES	TABLE_SCHEMA
-TABLES	TABLE_NAME
-TABLES	TABLE_TYPE
-TABLES	ENGINE
-TABLES	VERSION
-TABLES	ROW_FORMAT
-TABLES	TABLE_ROWS
+STATISTICS	COLLATION
+STATISTICS	COLUMN_NAME
+STATISTICS	TABLE_CATALOG
+STATISTICS	TABLE_SCHEMA
+STATISTICS	TABLE_NAME
+STATISTICS	NON_UNIQUE
+STATISTICS	INDEX_SCHEMA
+STATISTICS	INDEX_NAME
+STATISTICS	SEQ_IN_INDEX
 TABLES	AVG_ROW_LENGTH
 TABLES	DATA_LENGTH
 TABLES	MAX_DATA_LENGTH
@@ -694,7 +684,21 @@
 TABLES	TABLE_COLLATION
 TABLES	CHECKSUM
 TABLES	CREATE_OPTIONS
+TABLES	TABLE_ROWS
+TABLES	ROW_FORMAT
 TABLES	TABLE_COMMENT
+TABLES	TABLE_CATALOG
+TABLES	TABLE_SCHEMA
+TABLES	TABLE_NAME
+TABLES	TABLE_TYPE
+TABLES	ENGINE
+TABLES	VERSION
+TABLE_CONSTRAINTS	TABLE_NAME
+TABLE_CONSTRAINTS	TABLE_SCHEMA
+TABLE_CONSTRAINTS	CONSTRAINT_NAME
+TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
+TABLE_CONSTRAINTS	CONSTRAINT_CATALOG
+TABLE_CONSTRAINTS	CONSTRAINT_TYPE
 SELECT *
 FROM information_schema.key_column_usage;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
@@ -702,37 +706,373 @@
 FROM information_schema.referential_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 SELECT catalog_name, schema_name
-FROM information_schema.schemata;
+FROM information_schema.schemata
+ORDER BY schema_name;
 catalog_name	schema_name
 NULL	information_schema
 NULL	mysql
 NULL	test
 SELECT *
+FROM information_schema.session_status
+ORDER BY variable_name;
+VARIABLE_NAME	VARIABLE_VALUE
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+SHOW STATUS;
+Variable_name	Value
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+SELECT *
+FROM information_schema.global_status
+ORDER BY variable_name;
+VARIABLE_NAME	VARIABLE_VALUE
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+#	#
+SELECT *
 FROM information_schema.table_constraints;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 SELECT table_schema, table_name
-FROM information_schema.tables;
+FROM information_schema.tables
+ORDER BY table_name;
 table_schema	table_name
+information_schema	CHARACTER_SETS
+information_schema	COLLATIONS
+information_schema	COLLATION_CHARACTER_SET_APPLICABILITY
+information_schema	COLUMNS
 information_schema	GLOBAL_STATUS
 information_schema	GLOBAL_VARIABLES
-information_schema	SESSION_STATUS
-information_schema	SESSION_VARIABLES
-information_schema	INNODB_TRX
-information_schema	INNODB_LOCKS
-information_schema	INNODB_LOCK_WAITS
 information_schema	INNODB_CMP
-information_schema	INNODB_CMP_RESET
 information_schema	INNODB_CMPMEM
 information_schema	INNODB_CMPMEM_RESET
-information_schema	CHARACTER_SETS
-information_schema	COLLATIONS
-information_schema	COLLATION_CHARACTER_SET_APPLICABILITY
-information_schema	COLUMNS
+information_schema	INNODB_CMP_RESET
+information_schema	INNODB_LOCKS
+information_schema	INNODB_LOCK_WAITS
+information_schema	INNODB_TRX
 information_schema	KEY_COLUMN_USAGE
 information_schema	PLUGINS
 information_schema	PROCESSLIST
 information_schema	REFERENTIAL_CONSTRAINTS
 information_schema	SCHEMATA
+information_schema	SESSION_STATUS
+information_schema	SESSION_VARIABLES
 information_schema	STATISTICS
+information_schema	TABLES
 information_schema	TABLE_CONSTRAINTS
-information_schema	TABLES
 
=== modified file 'tests/t/information_schema.test'
--- tests/t/information_schema.test	2009-07-01 02:05:39 +0000
+++ tests/t/information_schema.test	2009-07-05 18:46:45 +0000
@@ -412,25 +412,29 @@
 # do a query on the CHARACTER_SET table in I_S 
 #
 SELECT *
-FROM information_schema.character_sets;
+FROM information_schema.character_sets
+ORDER BY character_set_name;
 
 #
 # perform a query on the COLLATIONS table
 #
 SELECT *
-FROM information_schema.collations;
+FROM information_schema.collations
+ORDER BY collation_name;
 
 #
 # perform a query on COLLATION_CHARACTER_SET_APPLICABILITY
 #
 SELECT * 
-FROM information_schema.collation_character_set_applicability;
+FROM information_schema.collation_character_set_applicability
+ORDER BY collation_name;
 
 #
 # perform a query on COLUMNS
 #
 SELECT table_name, column_name
-FROM information_schema.columns;
+FROM information_schema.columns
+ORDER BY table_name;
 
 #
 # perform a query on KEY_COLUMN_USAGE
@@ -448,7 +452,38 @@
 # query the SCHEMATA table
 #
 SELECT catalog_name, schema_name
-FROM information_schema.schemata;
+FROM information_schema.schemata
+ORDER BY schema_name;
+
+#
+# Query the STATUS and VARIABLES related
+# I_S related tables. 
+#
+--replace_column 1 # 2 #
+SELECT *
+FROM information_schema.session_status
+ORDER BY variable_name;
+
+--replace_column 1 # 2 #
+SHOW STATUS;
+
+#--replace_column 1 # 2 #
+#SELECT *
+#FROM information_schema.session_variables
+#ORDER BY variable_name;
+
+#--replace_column 1 # 2 #
+#SHOW VARIABLES;
+
+--replace_column 1 # 2 #
+SELECT *
+FROM information_schema.global_status
+ORDER BY variable_name;
+
+#--replace_column 1 # 2 #
+#SELECT *
+#FROM information_schema.global_variables
+#ORDER BY variable_name;
 
 #
 # query TABLE_CONSTRAINTS table
@@ -460,7 +495,8 @@
 # query TABLES
 #
 SELECT table_schema, table_name
-FROM information_schema.tables;
+FROM information_schema.tables
+ORDER BY table_name;
 
 # 
 # do a query on the PLUGINS table in I_S to ensure it works correctly