diff options
| -rw-r--r-- | mysql-test/r/warnings.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/warnings_engine_disabled.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/warnings.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/warnings_engine_disabled-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/warnings_engine_disabled.test | 19 |
5 files changed, 27 insertions, 13 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index d03c5ed2f54..88341c2f0b8 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -166,13 +166,6 @@ show variables like 'max_error_count'; Variable_name Value max_error_count 10 drop table t1; -create table t1 (id int) engine=NDB; -Warnings: -Warning 1266 Using storage engine MyISAM for table 't1' -alter table t1 engine=NDB; -Warnings: -Warning 1266 Using storage engine MyISAM for table 't1' -drop table t1; set table_type=MYISAM; Warnings: Warning 1541 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead diff --git a/mysql-test/r/warnings_engine_disabled.result b/mysql-test/r/warnings_engine_disabled.result new file mode 100644 index 00000000000..aa6170a60a7 --- /dev/null +++ b/mysql-test/r/warnings_engine_disabled.result @@ -0,0 +1,7 @@ +create table t1 (id int) engine=NDB; +Warnings: +Warning 1266 Using storage engine MyISAM for table 't1' +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.test b/mysql-test/t/warnings.test index eb5a24a8604..18ca0c96eb8 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -109,12 +109,6 @@ show variables like 'max_error_count'; set max_error_count=10; show variables like 'max_error_count'; -# -# Test for handler type -# -drop table t1; -create table t1 (id int) engine=NDB; -alter table t1 engine=NDB; drop table t1; # diff --git a/mysql-test/t/warnings_engine_disabled-master.opt b/mysql-test/t/warnings_engine_disabled-master.opt new file mode 100644 index 00000000000..99837e4a4cb --- /dev/null +++ b/mysql-test/t/warnings_engine_disabled-master.opt @@ -0,0 +1 @@ +--loose-skip-ndb diff --git a/mysql-test/t/warnings_engine_disabled.test b/mysql-test/t/warnings_engine_disabled.test new file mode 100644 index 00000000000..0b09cff7b1e --- /dev/null +++ b/mysql-test/t/warnings_engine_disabled.test @@ -0,0 +1,19 @@ +# +# Only run this test with a compiled in but disabled +# engine +# +disable_query_log; +--require r/true.require +select support = 'Disabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster'; +enable_query_log; + + +# +# Test for handler type, will select MyISAM and print a warning +# about that - since NDB is disabled +# +create table t1 (id int) engine=NDB; +alter table t1 engine=NDB; +drop table t1; + + |