summaryrefslogtreecommitdiff
path: root/mysql-test/r/group_by.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-07-04 03:24:25 +0300
committermonty@mysql.com <>2005-07-04 03:24:25 +0300
commit75ff7d8085cb5f1a489638a0b419c97fc5a6e9b4 (patch)
tree2be4c72f83f3339c8c88a49e45b63a00f77c9f23 /mysql-test/r/group_by.result
parent86d7b02199faddf91f9c7d7a6d62dda101be36ed (diff)
downloadmariadb-git-75ff7d8085cb5f1a489638a0b419c97fc5a6e9b4.tar.gz
After merge fixes
Better fix for ON DUPLICATE KEY UPDATE
Diffstat (limited to 'mysql-test/r/group_by.result')
-rw-r--r--mysql-test/r/group_by.result6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 85b923bf15a..28fa101f45f 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -721,13 +721,15 @@ SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1
WHERE hostname LIKE '%aol%'
GROUP BY hostname;
hostname no
+cache-dtc-af05.proxy.aol.com 1
+DROP TABLE t1;
CREATE TABLE t1 (n int);
INSERT INTO t1 VALUES (1);
SELECT n+1 AS n FROM t1 GROUP BY n;
n
2
-DROP TABLE t1;
-cache-dtc-af05.proxy.aol.com 1
+Warnings:
+Warning 1052 Column 'n' in group statement is ambiguous
DROP TABLE t1;
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (1,2), (1,3);