diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-29 19:22:22 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-29 19:22:22 +0200 |
| commit | 93ebd4d64d4748bd55834ac76b0b796d075f68b4 (patch) | |
| tree | c75b9bfc08d3d793d015a4b05b46c723ec15ce0e /mysql-test/r | |
| parent | 9c89ce7b3acc40fa9cd739b041611d79d43f55da (diff) | |
| parent | 3a180c331aa30b393d8cbeff51793ed61592bd75 (diff) | |
| download | mariadb-git-93ebd4d64d4748bd55834ac76b0b796d075f68b4.tar.gz | |
merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
BitKeeper/etc/logging_ok:
auto-union
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/group_by.result:
merge with 3.23.56
mysql-test/t/group_by.test:
merge with 3.23.56
sql/item_strfunc.h:
merge with 3.23.56
sql/mysqld.cc:
merge with 3.23.56
sql/sql_parse.cc:
merge with 3.23.56
sql/sql_yacc.yy:
merge with 3.23.56
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/group_by.result | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 35867cf6532..167b7b8ef1f 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -529,3 +529,21 @@ table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 6 Using temporary t2 ALL a NULL NULL NULL 4 Using where drop table t1,t2; +a MAX(b) INTERVAL (MAX(b), 1,3,10,30,39,40,50,60,100,1000) +1 4 2 +10 43 6 +a MAX(b) CASE MAX(b) when 4 then 4 when 43 then 43 else 0 end +1 4 4 +10 43 43 +a MAX(b) FIELD(MAX(b), '43', '4', '5') +1 4 2 +10 43 1 +a MAX(b) CONCAT_WS(MAX(b), '43', '4', '5') +1 4 434445 +10 43 43434435 +a MAX(b) ELT(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f') +1 4 d +10 43 NULL +a MAX(b) MAKE_SET(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h') +1 4 c +10 43 a,b,d,f |