compilation error fix

mysql-test/include/have_archive.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_blackhole.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_csv.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_exampledb.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_federated_db.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_innodb.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_multi_ndb.inc:
  test fix(according to new 'support' column values)
mysql-test/include/have_ndb.inc:
  test fix(according to new 'support' column values)
mysql-test/r/information_schema.result:
  result fix

mysql-test/include/have_archive.inc

 --disable_query_log
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'archive';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'archive';
 --enable_query_log

mysql-test/include/have_blackhole.inc

 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'blackhole';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'blackhole';
 enable_query_log;

mysql-test/include/have_csv.inc

 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'csv';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'csv';
 enable_query_log;

mysql-test/include/have_exampledb.inc

 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'example';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'example';
 enable_query_log;

mysql-test/include/have_federated_db.inc

 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'federated';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'federated';
 enable_query_log;

mysql-test/include/have_innodb.inc

 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'innodb';
 enable_query_log;

mysql-test/include/have_multi_ndb.inc

@@ -10,7 +10,7 @@ drop table if exists t1, t2;
 --enable_warnings
 flush tables;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
 enable_query_log;
 
 # Check that server2 has NDB support
@@ -21,7 +21,7 @@ drop table if exists t1, t2;
 --enable_warnings
 flush tables;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
 enable_query_log;
 
 # Check should be here as well...

mysql-test/include/have_ndb.inc

 # Check that server is compiled and started with support for NDB
 disable_query_log;
 --require r/true.require
-select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster';
 enable_query_log;
 
 

mysql-test/r/information_schema.result

@@ -1400,7 +1400,7 @@ VIEWS	information_schema.VIEWS	1
 End of 5.0 tests.
 select * from information_schema.engines WHERE ENGINE="MyISAM";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-MyISAM	ENABLED	Default engine as of MySQL 3.23 with great performance	NO	NO	NO
+MyISAM	DEFAULT	Default engine as of MySQL 3.23 with great performance	NO	NO	NO
 grant select on *.* to user3148@localhost;
 select user,db from information_schema.processlist;
 user	db

sql/sql_show.cc

@@ -3259,6 +3259,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin,
   handlerton *hton= plugin_data(plugin, handlerton *);
   const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
   CHARSET_INFO *scs= system_charset_info;
+  handlerton *default_type= ha_default_handlerton(thd);
   DBUG_ENTER("iter_schema_engines");
 
   if (!(hton->flags & HTON_HIDDEN))
@@ -3274,8 +3275,7 @@ static my_bool iter_schema_engines(THD *thd, plugin_ref plugin,
       restore_record(table, s->default_values);
 
       table->field[0]->store(name->str, name->length, scs);
-      if (hton->state == SHOW_OPTION_YES &&
-          hton == thd->variables.table_type)
+      if (hton->state == SHOW_OPTION_YES && default_type == hton)
         option_name= "DEFAULT";
       table->field[1]->store(option_name, strlen(option_name), scs);
       table->field[2]->store(plugin_decl(plugin)->descr,