Commit 1e506970 authored by unknown's avatar unknown
Browse files

Manual merge

parent 10349b11

mysql-test/t/olap.test

+31 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
drop table if exists t1,t2;

--enable_warnings



set @sav_dpi= @@div_precision_increment;

set div_precision_increment= 5;

show variables like 'div_precision_increment';



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),
@@ -153,6 +157,13 @@ SELECT DISTINCT SUM(b), COUNT(DISTINCT b), COUNT(*) FROM t1 
SELECT a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;

SELECT DISTINCT a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;



SELECT b, a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;

SELECT DISTINCT b,a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;



ALTER TABLE t1 ADD COLUMN c INT;

SELECT a,b,sum(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;

SELECT distinct a,b,sum(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;



DROP TABLE t1;



#
@@ -184,6 +195,7 @@ SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP; 
SELECT * FROM ( SELECT a, SUM(a) m FROM  t1 GROUP BY a WITH ROLLUP ) t2;



DROP TABLE t1;

set div_precision_increment= @sav_dpi;



#

# Tests for bug #7914: ROLLUP over expressions on temporary table
@@ -264,3 +276,22 @@ SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t; 
DROP TABLE t1;



# End of 4.1 tests



#

# Tests for bug #11639: ROLLUP over view executed through filesort

#



CREATE TABLE t1(id int, type char(1));

INSERT INTO t1 VALUES

  (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

  (6,"B"),(7,"A"),(8,"C"),(9,"A"),(10,"C");

CREATE VIEW v1 AS SELECT * FROM t1;



SELECT type FROM t1 GROUP BY type WITH ROLLUP;

SELECT type FROM v1 GROUP BY type WITH ROLLUP;

EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP;



DROP VIEW v1;

DROP TABLE t1;