Cleanups for storage engine patch. Changed two test results to now reflect the...

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

@@ -323,17 +323,12 @@ execute stmt4;
 Engine	Support	Comment
 MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance
 MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables
-HEAP	YES/NO	Alias for MEMORY
-MERGE	YES/NO	Collection of identical MyISAM tables
-MRG_MYISAM	YES/NO	Alias for MERGE
+MRG_MYISAM	YES/NO	Collection of identical MyISAM tables
 ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM
 MRG_ISAM	YES/NO	Obsolete storage engine, now replaced by MERGE
 InnoDB	YES/NO	Supports transactions, row-level locking, and foreign keys
-INNOBASE	YES/NO	Alias for INNODB
-BDB	YES/NO	Supports transactions and page-level locking
-BERKELEYDB	YES/NO	Alias for BDB
+BERKELEYDB	YES/NO	Supports transactions and page-level locking
 NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables
-NDB	YES/NO	Alias for NDBCLUSTER
 EXAMPLE	YES/NO	Example storage engine
 ARCHIVE	YES/NO	Archive storage engine
 CSV	YES/NO	CSV storage engine

mysql-test/r/variables.result

@@ -147,7 +147,7 @@ Variable_name	Value
 storage_engine	MEMORY
 show global variables like 'storage_engine';
 Variable_name	Value
-storage_engine	MERGE
+storage_engine	MRG_MYISAM
 set GLOBAL query_cache_size=100000;
 set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';

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;