diff options
| author | unknown <monty@mysql.com> | 2005-07-04 03:24:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-04 03:24:25 +0300 |
| commit | 90949a318cb47a211245fac1ec6df6b7479d2b9c (patch) | |
| tree | 2be4c72f83f3339c8c88a49e45b63a00f77c9f23 /mysql-test/r/group_by.result | |
| parent | 1e0d23f2afb7882bf54d93df475216737d652f34 (diff) | |
| download | mariadb-git-90949a318cb47a211245fac1ec6df6b7479d2b9c.tar.gz | |
After merge fixes
Better fix for ON DUPLICATE KEY UPDATE
mysql-test/r/group_by.result:
After merge fixes
mysql-test/r/select.result:
Reorder test to match 4.1 tests (will make future merges easier)
mysql-test/t/group_by.test:
Added --disable_ps_protocol to avoid extra warning
mysql-test/t/select.test:
Reorder test to match 4.1 tests (will make future merges easier)
sql/mysql_priv.h:
Better fix for ON DUPLICATE KEY UPDATE
sql/sql_base.cc:
After merge fixes
sql/sql_insert.cc:
Better fix for ON DUPLICATE KEY UPDATE
(old solution gave problem with item->cached_table)
sql/sql_prepare.cc:
Better fix for ON DUPLICATE KEY UPDATE
Diffstat (limited to 'mysql-test/r/group_by.result')
| -rw-r--r-- | mysql-test/r/group_by.result | 6 |
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); |