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 | 428830c50024475e85e12f6b188879c2de536529 (patch) | |
| tree | 2be4c72f83f3339c8c88a49e45b63a00f77c9f23 /mysql-test/t/group_by.test | |
| parent | eeee5fb10b59f6580ebcb08ebd82d0b75c66aa8f (diff) | |
| download | mariadb-git-428830c50024475e85e12f6b188879c2de536529.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/t/group_by.test')
| -rw-r--r-- | mysql-test/t/group_by.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index aa7ea9bb6cb..6845f310843 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -550,9 +550,9 @@ DROP TABLE t1; CREATE TABLE t1 (n int); INSERT INTO t1 VALUES (1); - +--disable_ps_protocol SELECT n+1 AS n FROM t1 GROUP BY n; - +--enable_ps_protocol DROP TABLE t1; # Test for bug #8614: GROUP BY 'const' with DISTINCT |