diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-21 15:23:40 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-21 15:23:40 -0800 |
| commit | 8127e631de90dddc25b3cdffe59e147333eb6c74 (patch) | |
| tree | 54255db89b41ce28fc4f6bac142a69740ad2eba5 /mysql-test/r | |
| parent | 02d368ff9d2e5121ed27c221d9bfd2b3792177a3 (diff) | |
| parent | 82fe8a4e715a3f8a797f31c8f464684b2ac4b6c2 (diff) | |
| download | mariadb-git-8127e631de90dddc25b3cdffe59e147333eb6c74.tar.gz | |
Merge 5.1->5.2
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/information_schema2.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/sum_distinct-big.result | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/r/information_schema2.result b/mysql-test/r/information_schema2.result new file mode 100644 index 00000000000..60a20944839 --- /dev/null +++ b/mysql-test/r/information_schema2.result @@ -0,0 +1,8 @@ +select variable_name from information_schema.session_status where variable_name = +(select variable_name from information_schema.session_status where variable_name = 'uptime'); +variable_name +UPTIME +select variable_name from information_schema.session_variables where variable_name = +(select variable_name from information_schema.session_variables where variable_name = 'basedir'); +variable_name +BASEDIR 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; |