Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.

May changes were to simplify storage engine setup and support for legacy call to show storage engines.


mysql-test/r/ps_1general.result:
  Fixed test results for new listing order
sql/examples/ha_tina.cc:
  Removed dead code
sql/examples/ha_tina.h:
  Removed dead code
sql/ha_archive.cc:
  Capitalized sotrage engine name and moved disabled code.
sql/ha_berkeley.cc:
  Moved deisabled code
sql/ha_federated.cc:
  Removed disabled code
sql/ha_innodb.cc:
  Removed disabled message
sql/ha_ndbcluster.cc:
  Removed disabled message
sql/handler.cc:
  Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
sql/handler.h:
  No longer need handlertons array.

1 files changed, 6 insertions, 6 deletions

diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index b65a8291062..d41d1b74ca7 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -323,17 +323,17 @@ 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
-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
-BERKELEYDB	YES/NO	Supports transactions and page-level locking
-NDBCLUSTER	YES/NO	Clustered, fault-tolerant, memory-based tables
+BerkeleyDB	YES/NO	Supports transactions and page-level locking
+BLACKHOLE	YES/NO	/dev/null storage engine (anything you write to it disappears)
 EXAMPLE	YES/NO	Example storage engine
 ARCHIVE	YES/NO	Archive storage engine
 CSV	YES/NO	CSV storage engine
+ndbcluster	YES/NO	Clustered, fault-tolerant, memory-based tables
 FEDERATED	YES/NO	Federated MySQL storage engine
-BLACKHOLE	YES/NO	/dev/null storage engine (anything you write to it disappears)
+MRG_MYISAM	YES/NO	Collection of identical MyISAM tables
+binlog	YES/NO	This is a meta storage engine to represent the binlog in a transaction
+ISAM	YES/NO	Obsolete storage engine
 drop table if exists t5;
 prepare stmt1 from ' drop table if exists t5 ' ;
 execute stmt1 ;