diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-07 16:38:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-07 16:38:37 +0200 |
| commit | 7d9aa596b540953892fe32c551057ef3ef641035 (patch) | |
| tree | e5a5f635842a20157ef2ed69775c40aad98631f7 /mysql-test/r/distinct.result | |
| parent | 46f98c3cd8a6f9449e37bfe62d8258855488152f (diff) | |
| parent | 8602b726a1d85aa0300d08dfea4ad8002fee9070 (diff) | |
| download | mariadb-git-7d9aa596b540953892fe32c551057ef3ef641035.tar.gz | |
Merge with 4.0 to get fix for MIN/MAX
BitKeeper/etc/ignore:
added support-files/MacOSX/Info.plist
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lex.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
configure.in:
Use local version
mysql-test/r/func_group.result:
merge
mysql-test/r/order_by.result:
merge
mysql-test/r/show_check.result:
merge
mysql-test/t/func_group.test:
merge
mysql-test/t/join.test:
merge
sql/mysql_priv.h:
Use local version
sql/sql_yacc.yy:
merge
sql/table.cc:
USe local
Diffstat (limited to 'mysql-test/r/distinct.result')
| -rw-r--r-- | mysql-test/r/distinct.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index ae1d9588bc7..1f459faa8f4 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -77,7 +77,6 @@ NULL NULL 10 VMT select id+0 as a,max(id),concat(facility) as b from t1 group by a order by b desc,a; a max(id) b -NULL NULL NULL 10 10 VMT 9 9 SRV 8 8 RV @@ -90,6 +89,7 @@ NULL NULL NULL 1 1 /L -1 -1 0 0 +NULL NULL NULL select id >= 0 and id <= 5 as grp,count(*) from t1 group by grp; grp count(*) NULL 1 |