move innodb specific test from group_by.test to group_by_innodb.test

4 files changed, 53 insertions, 53 deletions

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 553607dc03f..a9e91199949 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -2473,29 +2473,3 @@ c	1c
 v	2v,2v
 NULL	1c,2v,2v
 DROP TABLE t1,t2;
-#
-# Test of MDEV-4002
-#
-CREATE TABLE t1 ( 
-pk INT NOT NULL PRIMARY KEY, 
-d1 DOUBLE, 
-d2 DOUBLE, 
-i INT NOT NULL DEFAULT '0',
-KEY (i)
-) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,1.0,1.1,1),(2,2.0,2.2,2);
-PREPARE stmt FROM " 
-SELECT DISTINCT i, GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 ) 
-FROM t1 a1 NATURAL JOIN t1 a2 GROUP BY i WITH ROLLUP 
-";
-EXECUTE stmt;
-i	GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 )
-1	11.1
-2	22.2
-NULL	11.1,22.2
-EXECUTE stmt;
-i	GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 )
-1	11.1
-2	22.2
-NULL	11.1,22.2
-DROP TABLE t1;
diff --git a/mysql-test/r/group_by_innodb.result b/mysql-test/r/group_by_innodb.result
index 86d431b00d2..4b5d9990c51 100644
--- a/mysql-test/r/group_by_innodb.result
+++ b/mysql-test/r/group_by_innodb.result
@@ -29,5 +29,31 @@ SELECT COUNT(*), pk field1 FROM t1
 WHERE a = 'r' OR pk = 183 GROUP BY field1, field1;
 COUNT(*)	field1
 drop table t1;
-End of 5.5 tests
 set optimizer_switch=@save_ext_key_optimizer_switch;
+#
+# MDEV-4002 Server crash or valgrind errors in Item_func_group_concat::setup and Item_func_group_concat::add
+#
+CREATE TABLE t1 ( 
+pk INT NOT NULL PRIMARY KEY, 
+d1 DOUBLE, 
+d2 DOUBLE, 
+i INT NOT NULL DEFAULT '0',
+KEY (i)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1.0,1.1,1),(2,2.0,2.2,2);
+PREPARE stmt FROM " 
+SELECT DISTINCT i, GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 ) 
+FROM t1 a1 NATURAL JOIN t1 a2 GROUP BY i WITH ROLLUP 
+";
+EXECUTE stmt;
+i	GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 )
+1	11.1
+2	22.2
+NULL	11.1,22.2
+EXECUTE stmt;
+i	GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 )
+1	11.1
+2	22.2
+NULL	11.1,22.2
+DROP TABLE t1;
+End of 5.5 tests
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index e4120f284de..c6d594edc1f 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -1,5 +1,3 @@
---source include/have_innodb.inc
-
 # Initialise
 --disable_warnings
 drop table if exists t1,t2,t3;
@@ -1645,26 +1643,3 @@ FROM t1 JOIN t2 ON c = b GROUP BY b WITH ROLLUP;
 
 DROP TABLE t1,t2;
 
---echo #
---echo # Test of MDEV-4002
---echo #
-
-CREATE TABLE t1 ( 
-  pk INT NOT NULL PRIMARY KEY, 
-  d1 DOUBLE, 
-  d2 DOUBLE, 
-  i INT NOT NULL DEFAULT '0',
-  KEY (i)
-) ENGINE=InnoDB;
-
-INSERT INTO t1 VALUES (1,1.0,1.1,1),(2,2.0,2.2,2);
-
-PREPARE stmt FROM " 
-SELECT DISTINCT i, GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 ) 
-FROM t1 a1 NATURAL JOIN t1 a2 GROUP BY i WITH ROLLUP 
-";
-
-EXECUTE stmt;
-EXECUTE stmt;
-
-DROP TABLE t1;
diff --git a/mysql-test/t/group_by_innodb.test b/mysql-test/t/group_by_innodb.test
index 9733610dde1..df213cc189f 100644
--- a/mysql-test/t/group_by_innodb.test
+++ b/mysql-test/t/group_by_innodb.test
@@ -39,6 +39,31 @@ WHERE a = 'r' OR pk = 183 GROUP BY field1, field1;
 
 drop table t1;
 
+set optimizer_switch=@save_ext_key_optimizer_switch;
+
+--echo #
+--echo # MDEV-4002 Server crash or valgrind errors in Item_func_group_concat::setup and Item_func_group_concat::add
+--echo #
+
+CREATE TABLE t1 ( 
+  pk INT NOT NULL PRIMARY KEY, 
+  d1 DOUBLE, 
+  d2 DOUBLE, 
+  i INT NOT NULL DEFAULT '0',
+  KEY (i)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (1,1.0,1.1,1),(2,2.0,2.2,2);
+
+PREPARE stmt FROM " 
+SELECT DISTINCT i, GROUP_CONCAT(  d1, d2 ORDER BY d1, d2 ) 
+FROM t1 a1 NATURAL JOIN t1 a2 GROUP BY i WITH ROLLUP 
+";
+
+EXECUTE stmt;
+EXECUTE stmt;
+
+DROP TABLE t1;
+
 --echo End of 5.5 tests
 
-set optimizer_switch=@save_ext_key_optimizer_switch;