Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code.

mysql-test/r/ps_1general.result:
  Redoing test output with straightened up output for storage engine names.
mysql-test/r/variables.result:
  Fixed test case.
sql/handler.cc:
  Couple of format cleanups and a change in a comment.

1 files changed, 5 insertions, 4 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 543d4a5877c..34ce7e60eba 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -80,8 +80,7 @@ ulong total_ha_2pc;
 ulong savepoint_alloc_size;
 
 /*
-  This structure will go away with loadable storeage engines, we will instead
-  build it dynamically from the configure script.
+  This structure will go away in the future.
 */
 struct show_table_type_st sys_table_types[]=
 {
@@ -406,7 +405,8 @@ int ha_init()
       types->ht= &heap_hton;
       for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
       {
-        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type))
+        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, 
+                           table_alias->type))
           table_alias->st= types;
       }
       break;
@@ -417,7 +417,8 @@ int ha_init()
       types->ht= &myisammrg_hton;
       for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
       {
-        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type))
+        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, 
+                           table_alias->type))
           table_alias->st= types;
       }
       break;