diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-21 13:48:34 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-21 13:48:34 -0800 |
| commit | 82fe8a4e715a3f8a797f31c8f464684b2ac4b6c2 (patch) | |
| tree | 9e3f832672d2c500c5cb1b73f47f2b993f78b8cc /mysql-test | |
| parent | 43c6953fa1ba3aad4f065bfbd63cca6b5d0c5ce7 (diff) | |
| parent | fade3647ecb18a90d9c89a924a076d714ec45888 (diff) | |
| download | mariadb-git-82fe8a4e715a3f8a797f31c8f464684b2ac4b6c2.tar.gz | |
Merge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sum_distinct-big.result | 15 | ||||
| -rw-r--r-- | mysql-test/t/grant_lowercase.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/sum_distinct-big.test | 17 |
3 files changed, 33 insertions, 0 deletions
diff --git a/mysql-test/r/sum_distinct-big.result b/mysql-test/r/sum_distinct-big.result index 9b55d59ab91..d4933b31f80 100644 --- a/mysql-test/r/sum_distinct-big.result +++ b/mysql-test/r/sum_distinct-big.result @@ -103,5 +103,20 @@ sm 10323810 10325070 10326330 +# +# Bug mdev-4063: SUM(DISTINCT...) with small'max_heap_table_size +# (bug #56927) +# +SET max_heap_table_size=default; +INSERT INTO t1 SELECT id+16384 FROM t1; +DELETE FROM t2; +INSERT INTO t2 SELECT id FROM t1 ORDER BY id*rand(); +SELECT SUM(DISTINCT id) sm FROM t2; +sm +536887296 +SET max_heap_table_size=16384; +SELECT SUM(DISTINCT id) sm FROM t2; +sm +536887296 DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/t/grant_lowercase.test b/mysql-test/t/grant_lowercase.test index 157e13449c2..b07cb88afd6 100644 --- a/mysql-test/t/grant_lowercase.test +++ b/mysql-test/t/grant_lowercase.test @@ -1,4 +1,5 @@ # test cases for strmov(tmp_db, db) -> strnmov replacement in sql_acl.cc +--source include/not_embedded.inc # # http://seclists.org/fulldisclosure/2012/Dec/4 diff --git a/mysql-test/t/sum_distinct-big.test b/mysql-test/t/sum_distinct-big.test index 0859f4b3d89..d3710056c9a 100644 --- a/mysql-test/t/sum_distinct-big.test +++ b/mysql-test/t/sum_distinct-big.test @@ -63,5 +63,22 @@ SELECT SUM(DISTINCT id) sm FROM t1; SELECT SUM(DISTINCT id) sm FROM t2; SELECT SUM(DISTINCT id) sm FROM t1 GROUP BY id % 13; +--echo # +--echo # Bug mdev-4063: SUM(DISTINCT...) with small'max_heap_table_size +--echo # (bug #56927) +--echo # + +SET max_heap_table_size=default; + +INSERT INTO t1 SELECT id+16384 FROM t1; +DELETE FROM t2; +INSERT INTO t2 SELECT id FROM t1 ORDER BY id*rand(); + +SELECT SUM(DISTINCT id) sm FROM t2; + +SET max_heap_table_size=16384; + +SELECT SUM(DISTINCT id) sm FROM t2; + DROP TABLE t1; DROP TABLE t2; |