=== modified file 'mysql-test/r/blackhole.result'
--- mysql-test/r/blackhole.result	2012-03-28 08:22:31 +0000
+++ mysql-test/r/blackhole.result	2014-03-11 07:44:33 +0000
@@ -9,3 +9,11 @@ SELECT 1 FROM t1 WHERE a = ANY (SELECT a
 1
 DROP TABLE t1, t2;
 End of 5.5 tests 
+#
+# Bug#13948247 DIVISION BY 0 IN GET_BEST_DISJUNCT_QUICK WITH FORCE INDEX GROUP BY
+#
+CREATE TABLE t1(a INT, b INT, c INT, KEY(c), UNIQUE(a)) ENGINE = BLACKHOLE;
+SELECT 0 FROM t1 FORCE INDEX FOR GROUP BY(a) WHERE a = 0 OR b = 0 AND c = 0;
+0
+DROP TABLE t1;
+End of 5.6 tests

=== modified file 'mysql-test/t/blackhole.test'
--- mysql-test/t/blackhole.test	2012-03-28 08:22:31 +0000
+++ mysql-test/t/blackhole.test	2014-03-11 07:44:33 +0000
@@ -19,3 +19,12 @@ DROP TABLE t1, t2;
 
 --echo End of 5.5 tests 
 
+--echo #
+--echo # Bug#13948247 DIVISION BY 0 IN GET_BEST_DISJUNCT_QUICK WITH FORCE INDEX GROUP BY
+--echo #
+
+CREATE TABLE t1(a INT, b INT, c INT, KEY(c), UNIQUE(a)) ENGINE = BLACKHOLE;
+SELECT 0 FROM t1 FORCE INDEX FOR GROUP BY(a) WHERE a = 0 OR b = 0 AND c = 0;
+DROP TABLE t1;
+
+--echo End of 5.6 tests