diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 138264fd4e1..0ac7c8e8770 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -2178,3 +2178,21 @@ INSERT INTO t1 VALUES(0);
 DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 End of 5.1 tests
+#
+# BUG#598247: partition.test produces valgrind errors in 5.3-based branches
+#
+CREATE TABLE t1 (
+a INT DEFAULT NULL,
+b DOUBLE DEFAULT NULL,
+c INT DEFAULT NULL,
+KEY idx2(b,a)
+) engine=myisam PARTITION BY HASH(c) PARTITIONS 3;
+INSERT INTO t1 VALUES (6,8,9);
+INSERT INTO t1 VALUES (6,8,10);
+SELECT 1 FROM t1 JOIN t1 AS t2 USING (a);
+1
+1
+1
+1
+1
+drop table t1;
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index c4c17a6d2f1..3c3810b5296 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -2192,3 +2192,22 @@ DROP TABLE t1;
 SET GLOBAL myisam_use_mmap=default;
 
 --echo End of 5.1 tests
+
+
+--echo #
+--echo # BUG#598247: partition.test produces valgrind errors in 5.3-based branches
+--echo #
+CREATE TABLE t1 (
+  a INT DEFAULT NULL,
+  b DOUBLE DEFAULT NULL,
+  c INT DEFAULT NULL,
+  KEY idx2(b,a)
+) engine=myisam PARTITION BY HASH(c) PARTITIONS 3;
+
+INSERT INTO t1 VALUES (6,8,9);
+INSERT INTO t1 VALUES (6,8,10);
+
+SELECT 1 FROM t1 JOIN t1 AS t2 USING (a);
+
+drop table t1;
+