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, 2 insertions, 5 deletions

diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test
index a8b8e5f5103..eb5a24a8604 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -113,11 +113,8 @@ show variables like 'max_error_count';
 # Test for handler type
 #
 drop table t1;
-#create table t1 (id int) engine=isam;
-#alter table t1 engine=isam;
-#drop table t1;
-create table t1 (id int) engine=merge;
-alter table t1 engine=merge;
+create table t1 (id int) engine=NDB;
+alter table t1 engine=NDB;
 drop table t1;
 
 #