summaryrefslogtreecommitdiff
path: root/mysql-test/r/olap.result
diff options
context:
space:
mode:
authorunknown <holyfoot@hf-ibm.(none)>2005-05-06 01:01:39 +0500
committerunknown <holyfoot@hf-ibm.(none)>2005-05-06 01:01:39 +0500
commit8a27426fcdac4f2422f83cec2928004fd9074962 (patch)
tree2a5b7c2ccfaeb6ea061bc33fe28c66d4988ff336 /mysql-test/r/olap.result
parenta8e4fbcbe386371a105653e5fc02f66371c27fd1 (diff)
downloadmariadb-git-8a27426fcdac4f2422f83cec2928004fd9074962.tar.gz
Tests and results fixed with last precision/decimal related modifications
mysql-test/r/case.result: test result fixed mysql-test/r/create.result: test result fixed mysql-test/r/distinct.result: test result fixed mysql-test/r/func_group.result: test result fixed mysql-test/r/func_op.result: test result fixed mysql-test/r/group_by.result: test result fixed mysql-test/r/metadata.result: test result fixed mysql-test/r/olap.result: test result fixed mysql-test/r/ps_2myisam.result: test result fixed mysql-test/r/ps_3innodb.result: test result fixed mysql-test/r/ps_4heap.result: test result fixed mysql-test/r/ps_5merge.result: test result fixed mysql-test/r/ps_6bdb.result: test result fixed mysql-test/r/ps_7ndb.result: test result fixed mysql-test/r/select.result: test result fixed mysql-test/r/sp.result: test result fixed mysql-test/r/type_decimal.result: test result fixed mysql-test/r/type_newdecimal.result: test result fixed mysql-test/r/union.result: test result fixed mysql-test/r/variables.result: test result fixed mysql-test/t/func_group.test: test modified mysql-test/t/olap.test: test modified mysql-test/t/type_decimal.test: test modified
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r--mysql-test/r/olap.result26
1 files changed, 16 insertions, 10 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index 06f474923eb..1d8830b7d5f 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
@@ -1,4 +1,9 @@
drop table if exists t1,t2;
+set @sav_dpi= @@div_precision_increment;
+set div_precision_increment= 5;
+show variables like 'div_precision_increment';
+Variable_name Value
+div_precision_increment 5
create table t1 (product varchar(32), country_id int not null, year int, profit int);
insert into t1 values ( 'Computer', 2,2000, 1200),
( 'TV', 1, 1999, 150),
@@ -40,11 +45,11 @@ TV 600
NULL 7785
select product, sum(profit),avg(profit) from t1 group by product with rollup;
product sum(profit) avg(profit)
-Calculator 275 68.7500
-Computer 6900 1380.0000
-Phone 10 10.0000
-TV 600 120.0000
-NULL 7785 519.0000
+Calculator 275 68.75000
+Computer 6900 1380.00000
+Phone 10 10.00000
+TV 600 120.00000
+NULL 7785 519.00000
select product, country_id , year, sum(profit) from t1 group by product, country_id, year;
product country_id year sum(profit)
Calculator 1 1999 50
@@ -244,11 +249,11 @@ select product, country_id , year, sum(profit) from t1 group by product, country
product country_id year sum(profit)
select concat(':',product,':'), sum(profit),avg(profit) from t1 group by product with rollup;
concat(':',product,':') sum(profit) avg(profit)
-:Calculator: 275 68.7500
-:Computer: 6900 1380.0000
-:Phone: 10 10.0000
-:TV: 600 120.0000
-:TV: 7785 519.0000
+:Calculator: 275 68.75000
+:Computer: 6900 1380.00000
+:Phone: 10 10.00000
+:TV: 600 120.00000
+:TV: 7785 519.00000
select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
ERROR 42000: This version of MySQL doesn't yet support 'CUBE'
explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
@@ -450,3 +455,4 @@ a m
2 2
NULL 3
DROP TABLE t1;
+set div_precision_increment= @sav_dpi;