diff options
| author | unknown <brian@zim.(none)> | 2006-11-20 14:04:07 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-11-20 14:04:07 -0800 |
| commit | b894f480135de045414f9e7736e1ddc07d162332 (patch) | |
| tree | 9d172727e788f9f2b4aebe4151b7d9d3a674a7cb /mysql-test | |
| parent | 7d6b4a1ab06b22505a68334aeae0204cf0e4bb7a (diff) | |
| download | mariadb-git-b894f480135de045414f9e7736e1ddc07d162332.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/warnings.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/warnings-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/warnings.test | 7 |
3 files changed, 4 insertions, 8 deletions
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; diff --git a/mysql-test/t/warnings-master.opt b/mysql-test/t/warnings-master.opt index e924a22e2ce..e69de29bb2d 100644 --- a/mysql-test/t/warnings-master.opt +++ b/mysql-test/t/warnings-master.opt @@ -1 +0,0 @@ ---skip-isam --skip-merge 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; # |