handler.cc:

  Revise output of SHOW ENGINES.

sql/handler.cc

@@ -62,21 +62,21 @@ static SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
 struct show_table_type_st sys_table_types[]=
 {
   {"MyISAM",	&have_yes,
-   "Default type from 3.23 with great performance", DB_TYPE_MYISAM},
+   "Default engine as of MySQL 3.23 with great performance", DB_TYPE_MYISAM},
   {"HEAP",	&have_yes,
-   "Hash based, stored in memory, useful for temporary tables", DB_TYPE_HEAP},
+   "Alias for MEMORY", DB_TYPE_HEAP},
   {"MEMORY",	&have_yes,
-   "Alias for HEAP", DB_TYPE_HEAP},
+   "Hash based, stored in memory, useful for temporary tables", DB_TYPE_HEAP},
   {"MERGE",	&have_yes,
    "Collection of identical MyISAM tables", DB_TYPE_MRG_MYISAM},
   {"MRG_MYISAM",&have_yes,
    "Alias for MERGE", DB_TYPE_MRG_MYISAM},
   {"ISAM",	&have_isam,
-   "Obsolete table type; Is replaced by MyISAM", DB_TYPE_ISAM},
+   "Obsolete storage engine, now replaced by MyISAM", DB_TYPE_ISAM},
   {"MRG_ISAM",  &have_isam,
-   "Obsolete table type; Is replaced by MRG_MYISAM", DB_TYPE_MRG_ISAM},
+   "Obsolete storage engine, now replaced by MERGE", DB_TYPE_MRG_ISAM},
   {"InnoDB",	&have_innodb,
-   "Supports transactions, row-level locking and foreign keys", DB_TYPE_INNODB},
+   "Supports transactions, row-level locking, and foreign keys", DB_TYPE_INNODB},
   {"INNOBASE",	&have_innodb,
    "Alias for INNODB", DB_TYPE_INNODB},
   {"BDB",	&have_berkeley_db,
@@ -84,7 +84,7 @@ struct show_table_type_st sys_table_types[]=
   {"BERKELEYDB",&have_berkeley_db,
    "Alias for BDB", DB_TYPE_BERKELEY_DB},
   {"NDBCLUSTER", &have_ndbcluster,
-   "Clustered, fault tolerant memory based tables", DB_TYPE_NDBCLUSTER},
+   "Clustered, fault-tolerant, memory-based tables", DB_TYPE_NDBCLUSTER},
   {"NDB", &have_ndbcluster,
    "Alias for NDBCLUSTER", DB_TYPE_NDBCLUSTER},
   {"EXAMPLE",&have_example_db,