1 files changed, 1 insertions, 20 deletions
diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test
index c42dd22024c..9e7e3e4f945 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -65,6 +65,7 @@ create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
 insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
 alter table t1 modify c char(4);
 alter table t1 add d char(2);
+--error 1048
 update t1 set a=NULL where a=10;
 update t1 set c='mysql ab' where c='test';
 update t1 set d=c;
@@ -109,24 +110,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=isam;
-alter table t1 engine=isam;
-drop table t1;
-
-create table t1 (id int) engine=merge;
-alter table t1 engine=merge;
-drop table t1;
-
-#
-# Test for deprecated TYPE= syntax
-#
-
-create table t1 (id int) type=heap;
-alter table t1 type=myisam;
 drop table t1;
 
 #
@@ -162,8 +145,6 @@ drop table t1;
 # Bug#20778: strange characters in warning message 1366 when called in SP
 #
 
-let $engine_type= innodb;
-
 CREATE TABLE t1( f1 CHAR(20) );
 CREATE TABLE t2( f1 CHAR(20), f2 CHAR(25) );
 CREATE TABLE t3( f1 CHAR(20), f2 CHAR(25), f3 DATE );