From b894f480135de045414f9e7736e1ddc07d162332 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Nov 2006 14:04:07 -0800 Subject: 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 --- mysql-test/r/warnings.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/r/warnings.result') diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index d07f90d41b9..d03c5ed2f54 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -166,10 +166,10 @@ show variables like 'max_error_count'; Variable_name Value max_error_count 10 drop table t1; -create table t1 (id int) engine=merge; +create table t1 (id int) engine=NDB; Warnings: Warning 1266 Using storage engine MyISAM for table 't1' -alter table t1 engine=merge; +alter table t1 engine=NDB; Warnings: Warning 1266 Using storage engine MyISAM for table 't1' drop table t1; -- cgit v1.2.1