summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-09-03 16:48:37 +0300
committerunknown <monty@mashka.mysql.fi>2002-09-03 16:48:37 +0300
commita040cf1eb25aaf905972cdf11e6aa762106fce7a (patch)
tree6bdf071925753548518010c1da84f4d3ce0f8de0 /mysql-test
parentffb97b49948b16ea9e53f544818dedf4b0f11697 (diff)
parent3307f95554d9bca2736d79b970c2f118c66a27ed (diff)
downloadmariadb-git-a040cf1eb25aaf905972cdf11e6aa762106fce7a.tar.gz
Merge
Docs/manual.texi: SCCS merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/distinct.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 8f8770e5602..1d18fb4c75b 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -69,7 +69,8 @@ a max(id) b
0 0
NULL NULL NULL
grp count(*)
-0 7
+NULL 1
+0 6
1 6
FACILITY
NULL