diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-24 11:50:09 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-24 11:50:09 +0300 |
commit | ee8ab6d9e6ac44c670b92cfb095abedf42fa0dab (patch) | |
tree | 4acc70703363e4a6f03dc72000fe43ee6428288f /mysql-test/r/func_group.result | |
parent | f78be6c8e997a2e5c5e971749d35ef4e44e425e2 (diff) | |
parent | e66f7e1d3684c49a97bed7aefb616181b696a2f8 (diff) | |
download | mariadb-git-ee8ab6d9e6ac44c670b92cfb095abedf42fa0dab.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.1-opt
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/item.cc:
Auto merged
sql/opt_sum.cc:
merge bug 30715 to 5.1-opt
Diffstat (limited to 'mysql-test/r/func_group.result')
-rw-r--r-- | mysql-test/r/func_group.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index ce29d25b736..a87337f6451 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1378,4 +1378,9 @@ SELECT 1 FROM t1 GROUP BY (SELECT SLEEP(0) FROM t1 ORDER BY AVG(DISTINCT a) ); 1 1 DROP TABLE t1; +CREATE TABLE t1 (a int, b date NOT NULL, KEY k1 (a,b)); +SELECT MIN(b) FROM t1 WHERE a=1 AND b>'2007-08-01'; +MIN(b) +NULL +DROP TABLE t1; End of 5.0 tests |