diff options
| author | unknown <pekka@mysql.com> | 2005-04-01 10:13:37 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-04-01 10:13:37 +0200 |
| commit | cb1bdf4d84221312258dd8451f58c06337ff108d (patch) | |
| tree | 748a9a8f5a64181143501a3ccc782f1dfa1af35f /mysql-test/r/group_by.result | |
| parent | 5b0c75259c0b62a0a8efc4964fb70816e1d1954e (diff) | |
| parent | 8ef1afbaa4ba0c639f2ecf47853086e783cc1efa (diff) | |
| download | mariadb-git-cb1bdf4d84221312258dd8451f58c06337ff108d.tar.gz | |
Merge
mysql-test/r/group_by.result:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_select.cc:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
sql/item_cmpfunc.cc:
merge
support-files/mysql.server.sh:
merge
Diffstat (limited to 'mysql-test/r/group_by.result')
| -rw-r--r-- | mysql-test/r/group_by.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 9ff1fbcb833..af69cc83e83 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12 concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120 concat('val-', @a + 120*D.a) from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; -delete from t2 where a = 2 and b = 'val-2' limit 30; +delete from t2 where a = 2 and b = 'val-2' order by a,b,c,d limit 30; explain select c from t2 where a = 2 and b = 'val-2' group by c; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref PRIMARY,a PRIMARY 402 const,const 6 Using where |