summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMartin Hansson <martin.hansson@sun.com>2010-06-11 10:15:55 +0200
committerMartin Hansson <martin.hansson@sun.com>2010-06-11 10:15:55 +0200
commit6d38a625c158cb56b33d14496f353652d61f0f2d (patch)
tree5be20f0b8752e765d2a5b911e0b37b1fe120d361 /mysql-test
parentd6e003545adb73c2d653ec4c9e17d4695dcfc12a (diff)
parent5bace3f049de457ddbeb3a1946089c0f4c479229 (diff)
downloadmariadb-git-6d38a625c158cb56b33d14496f353652d61f0f2d.tar.gz
Merge of fix for bug#53859.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/group_min_max.result13
-rw-r--r--mysql-test/t/group_min_max.test15
2 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result
index 9c6575af16c..07b4c71cbe3 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/r/group_min_max.result
@@ -2767,6 +2767,19 @@ SELECT MIN( a ) FROM t1 WHERE a IS NULL;
MIN( a )
NULL
DROP TABLE t1;
+#
+# Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&, Item*) at
+# opt_sum.cc:305
+#
+CREATE TABLE t1 ( a INT, KEY (a) );
+INSERT INTO t1 VALUES (1), (2), (3);
+SELECT MIN( a ) AS min_a
+FROM t1
+WHERE a > 1 AND a IS NULL
+ORDER BY min_a;
+min_a
+NULL
+DROP TABLE t1;
End of 5.1 tests
#
# WL#3220 (Loose index scan for COUNT DISTINCT)
diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test
index 5701e975569..fa52da63195 100644
--- a/mysql-test/t/group_min_max.test
+++ b/mysql-test/t/group_min_max.test
@@ -1085,6 +1085,21 @@ INSERT INTO t1 VALUES (1), (2), (3);
--source include/min_null_cond.inc
DROP TABLE t1;
+--echo #
+--echo # Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&, Item*) at
+--echo # opt_sum.cc:305
+--echo #
+CREATE TABLE t1 ( a INT, KEY (a) );
+INSERT INTO t1 VALUES (1), (2), (3);
+
+SELECT MIN( a ) AS min_a
+FROM t1
+WHERE a > 1 AND a IS NULL
+ORDER BY min_a;
+
+DROP TABLE t1;
+
+
--echo End of 5.1 tests