summaryrefslogtreecommitdiff
path: root/mysql-test/r/olap.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-07 00:31:53 +0300
committermonty@mysql.com <>2005-06-07 00:31:53 +0300
commit775f17667be97bc76a25324e8a99e72ae445e223 (patch)
tree1a560cda860f9d9f422087da93fcdc67cd9f66d0 /mysql-test/r/olap.result
parent8c94b5fba7f6e5518616615da63c8029c5790aea (diff)
parentabb2d7aa347c0d12ad40fc04315167d3274baae0 (diff)
downloadmariadb-git-775f17667be97bc76a25324e8a99e72ae445e223.tar.gz
Merge with 4.1
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r--mysql-test/r/olap.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index 5ba2bc80484..c37a42d3fa7 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
@@ -88,7 +88,7 @@ TV NULL NULL 600
NULL NULL NULL 7785
explain extended select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL NULL NULL NULL NULL 15 Using temporary; Using filesort
+1 SIMPLE t1 ALL NULL NULL NULL NULL 15 Using filesort
Warnings:
Note 1003 select `test`.`t1`.`product` AS `product`,`test`.`t1`.`country_id` AS `country_id`,`test`.`t1`.`year` AS `year`,sum(`test`.`t1`.`profit`) AS `sum(profit)` from `test`.`t1` group by `test`.`t1`.`product`,`test`.`t1`.`country_id`,`test`.`t1`.`year` with rollup
select product, country_id , sum(profit) from t1 group by product desc, country_id with rollup;