additional after merge fix

mysql-test/r/partition_range.result:
  removed fix for bug#30573
mysql-test/suite/parts/r/rpl_partition.result:
  updated result file
mysql-test/t/partition_range.test:
  removed test case for bug#30573
sql/ha_partition.cc:
  removed fix for bug#30573

1 files changed, 20 insertions, 20 deletions

diff --git a/mysql-test/t/partition_range.test b/mysql-test/t/partition_range.test
index a9f6d410fa3..6ed3abab46a 100644
--- a/mysql-test/t/partition_range.test
+++ b/mysql-test/t/partition_range.test
@@ -762,24 +762,24 @@ DROP TABLE t1;
 #
 # BUG#30573: get wrong result with "group by" on PARTITIONed table
 #
-create table t1 (a int);
-insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-CREATE TABLE t2 (
-  defid int(10) unsigned NOT NULL,
-  day int(10) unsigned NOT NULL,
-  count int(10) unsigned NOT NULL,
-  filler char(200),
-  KEY (defid,day)
-) 
-PARTITION BY RANGE (day) (
-  PARTITION p7 VALUES LESS THAN (20070401) , 
-  PARTITION p8 VALUES LESS THAN (20070501));
-
-insert into t2 select 20, 20070311, 1, 'filler' from t1 A, t1 B;
-insert into t2 select 20, 20070411, 1, 'filler' from t1 A, t1 B;
-insert into t2 values(52, 20070321, 123, 'filler') ;
-insert into t2 values(52, 20070322, 456, 'filler') ;
-
-select sum(count) from t2 ch where ch.defid in (50,52) and ch.day between 20070320 and 20070401 group by defid;
-drop table t1, t2;
+#create table t1 (a int);
+#insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+#CREATE TABLE t2 (
+#  defid int(10) unsigned NOT NULL,
+#  day int(10) unsigned NOT NULL,
+#  count int(10) unsigned NOT NULL,
+#  filler char(200),
+#  KEY (defid,day)
+#) 
+#PARTITION BY RANGE (day) (
+#  PARTITION p7 VALUES LESS THAN (20070401) , 
+#  PARTITION p8 VALUES LESS THAN (20070501));
+
+#insert into t2 select 20, 20070311, 1, 'filler' from t1 A, t1 B;
+#insert into t2 select 20, 20070411, 1, 'filler' from t1 A, t1 B;
+#insert into t2 values(52, 20070321, 123, 'filler') ;
+#insert into t2 values(52, 20070322, 456, 'filler') ;
+
+#select sum(count) from t2 ch where ch.defid in (50,52) and ch.day between 20070320 and 20070401 group by defid;
+#drop table t1, t2;