WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes

1 files changed, 7 insertions, 8 deletions

diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/t/partition_pruning.test
index a5821f057c3..30f4f37ee04 100644
--- a/mysql-test/t/partition_pruning.test
+++ b/mysql-test/t/partition_pruning.test
@@ -316,25 +316,24 @@ delete t1,t2 from t1, t2 where t1.a=5 and t2.a=5;
 show status like 'Handler_read_rnd_next';
 drop table t1,t2;
 
-# WL# 2986
-DROP TABLE IF EXISTS `t1`;
+#
+# WL#2986 Tests (Checking if partition pruning results are used at query
+#   execution phase)
+#
 CREATE TABLE `t1` (
   `a` int(11) default NULL
 );
-
 INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
-DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
   `a` int(11) default NULL,
   KEY `a` (`a`)
 ) ;
 
 insert into t2 select A.a + 10*(B.a + 10* C.a) from t1 A, t1 B, t1 C ;
-
 insert into t1 select a from t2;
 
-DROP TABLE IF EXISTS `t2`;
+drop table t2;
 CREATE TABLE `t2` (
   `a` int(11) default NULL,
   `b` int(11) default NULL
@@ -377,8 +376,7 @@ flush status;
 delete from t2 where a > 600;
 show status like 'Handler_read_rnd_next';
 
-
-DROP TABLE IF EXISTS `t2`;
+drop table t2;
 CREATE TABLE `t2` (
   `a` int(11) default NULL,
   `b` int(11) default NULL,
@@ -448,5 +446,6 @@ show status like 'Handler_read_prev';
 show status like 'Handler_read_next';
 
 drop table t1, t2;
+
 # No tests for NULLs in RANGE(monotonic_expr()) - they depend on BUG#15447
 # being fixed.