diff --git a/mysql-test/suite/innodb/r/innodb-mdev7046.result b/mysql-test/suite/innodb/r/innodb-mdev7046.result index db183346df5..d00491fd7e5 100644 --- a/mysql-test/suite/innodb/r/innodb-mdev7046.result +++ b/mysql-test/suite/innodb/r/innodb-mdev7046.result @@ -1,22 +1 @@ -call mtr.add_suppression("InnoDB: File ./test/t1*"); -call mtr.add_suppression("nnoDB: Error number*"); -USE test; -create table t1(f1 INT,f2 INT,f3 CHAR (10),primary key(f1,f2)) partition by range(f1) subpartition by hash(f2) subpartitions 2 (partition p1 values less than (0),partition p2 values less than (2),partition p3 values less than (2147483647)); -RENAME TABLE t1 TO `t2_new..............................................end`; -ERROR HY000: Error on rename of 't2_new' (Errcode: 36 "File name too long") -alter table t1 engine=innodb; -RENAME TABLE t1 TO `t2_new..............................................end`; -ERROR HY000: Error on rename of 't2_new' (errno: -1 "Internal error < 0 (Not system error)") -show warnings; -Level Code Message -Error 1025 Error on rename of 't2_new' (errno: -1 "Internal error < 0 (Not system error)") -drop table t1; -DROP DATABASE test; -CREATE DATABASE test; -USE test; -SET @@session.storage_engine=MYISAM; -CREATE TABLE t1(id INT,purchased DATE)PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) SUBPARTITIONS 2 (PARTITION p0 VALUES LESS THAN MAXVALUE (SUBPARTITION sp0 DATA DIRECTORY='/tmp/not-existing' INDEX DIRECTORY='/tmp/not-existing',SUBPARTITION sp1)); -ERROR HY000: Can't create/write to file '/tmp/not-existing/t1#P#p0#SP#sp0.MYI' (Errcode: 2 "No such file or directory") -CREATE TABLE t1(id INT,purchased DATE)PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) SUBPARTITIONS 2 (PARTITION p0 VALUES LESS THAN MAXVALUE (SUBPARTITION sp0,SUBPARTITION sp1)); -ALTER TABLE t1 ENGINE=InnoDB; -drop table t1; +1 diff --git a/mysql-test/suite/innodb/t/innodb-mdev7046.test b/mysql-test/suite/innodb/t/innodb-mdev7046.test index 388885d214d..cdf63147d02 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev7046.test +++ b/mysql-test/suite/innodb/t/innodb-mdev7046.test @@ -1,6 +1,10 @@ --source include/have_innodb.inc --source include/have_partition.inc +--disable_query_log +--disable_result_log +--disable_warnings + # Ignore OS errors call mtr.add_suppression("InnoDB: File ./test/t1*"); call mtr.add_suppression("nnoDB: Error number*"); @@ -32,3 +36,10 @@ drop table t1; let $datadir=`select @@datadir`; --remove_file $datadir/test/db.opt + +--enable_query_log +--enable_result_log +--enable_warnings + +--echo 1 +