merge fixes

mysql-test/r/partition.result

@@ -27,6 +27,7 @@ select * from t1 where (a + 1) > 10;
 a
 18446744073709551613
 18446744073709551614
+drop table t1;
 create table t1 (a int)
 engine = csv
 partition by list (a)

mysql-test/r/partition_range.result

@@ -389,6 +389,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM)
 insert into t1 values (0xFFFFFFFFFFFFFFFF);
 ERROR HY000: Table has no partition for value 18446744073709551615
+drop table t1;
 create table t1 (a int)
 partition by range (MOD(a,3))
 subpartition by hash(a)

mysql-test/t/partition_range.test

@@ -411,6 +411,7 @@ partition by range (a)
 show create table t1;
 --error ER_NO_PARTITION_FOR_GIVEN_VALUE
 insert into t1 values (0xFFFFFFFFFFFFFFFF);
+drop table t1;
 
 #
 # BUG 18962 Errors in DROP PARTITION