Commit a6933a63 authored by unknown's avatar unknown
Browse files

Bug#24997 warnings test case failure 

 - Move the specific test case to a separate file that is run only
   if we have a disabled handler.


mysql-test/r/warnings.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/r/warnings_engine_disabled.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings_engine_disabled-master.opt:
  New BitKeeper file ``mysql-test/t/warnings_engine_disabled-master.opt''
mysql-test/t/warnings_engine_disabled.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
parent e25d18d1

mysql-test/r/warnings.result

+0 −7
Original line number Diff line number Diff line
@@ -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

mysql-test/r/warnings_engine_disabled.result

0 → 100644
+7 −0
Original line number Diff line number Diff line 
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;

mysql-test/t/warnings.test

+0 −6
Original line number Diff line number Diff line
@@ -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;



#

mysql-test/t/warnings_engine_disabled-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--loose-skip-ndb

mysql-test/t/warnings_engine_disabled.test

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# 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;