This straightens up usage of have_ variables, and removes dead -skip-isam option.

mysql-test/r/warnings.result:
  Modified skip to use NDB.
mysql-test/t/warnings-master.opt:
  Removed dead options
mysql-test/t/warnings.test:
  Updated test to use NDB
sql/mysql_priv.h:
  Removed dead have_ variables
sql/mysqld.cc:
  Removed dead options (one which was never documenteD).
sql/set_var.cc:
  Removed have_ variables for prefered usage of show engines
storage/federated/ha_federated.cc:
  Removed head variable
storage/myisammrg/ha_myisammrg.cc:
  Updated to use correct state

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 57ef1dad6f7..70b8131f002 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -577,7 +577,7 @@ static int myisammrg_init(void *p)
 
   myisammrg_hton= (handlerton *)p;
 
-  myisammrg_hton->state= have_merge_db;
+  myisammrg_hton->state= SHOW_OPTION_YES;
   myisammrg_hton->db_type= DB_TYPE_MRG_MYISAM;
   myisammrg_hton->create= myisammrg_create_handler;
   myisammrg_hton->panic= myisammrg_panic;