1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.0-> 5.1

Browse Source
This commit is contained in:
Patrick Crews 2009-04-16 13:50:38 -04:00
commit abd3f4cc0d
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/count_distinct3.result
View File

@ -2,7 +2,8 @@ DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (id INTEGER, grp TINYINT, id_rev INTEGER); CREATE TABLE t1 (id INTEGER, grp TINYINT, id_rev INTEGER);
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
4181000 4201000
SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp; SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp;
# Begin cleanup
SET session myisam_sort_buffer_size = @orig_myisam_sort_buffer_size;
DROP TABLE t1; DROP TABLE t1;
set @@read_buffer_size=default;

39
mysql-test/t/count_distinct3.test
View File

@ -1,4 +1,4 @@
# # Bug #958 a big table without indices and select with group by doesnt work
# this is a test for error 1032 in count(distinct) + group by, introduced in # this is a test for error 1032 in count(distinct) + group by, introduced in
# mysql-4.1 # mysql-4.1
# #
@ -21,27 +21,16 @@ while ($1)
INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev); INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
dec $1; dec $1;
} }
set @@read_buffer_size=2*1024*1024;
CREATE TABLE t2 SELECT * FROM t1; # We increase the size of t1 here.
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2; SET @orig_myisam_sort_buffer_size = @@session.myisam_sort_buffer_size;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1; SET session myisam_sort_buffer_size=20000000;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2; INSERT INTO t1
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1; SELECT A.id, A.grp, A.id_rev
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2; FROM
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1; t1 A,
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2; (SELECT * FROM t1 B LIMIT 100) B,
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1; (SELECT * FROM t1 Z LIMIT 42) Z;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
DROP TABLE t2;
--enable_query_log --enable_query_log
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
@ -49,12 +38,12 @@ SELECT COUNT(*) FROM t1;
# As t1 contains random numbers, results are different from test to test. # As t1 contains random numbers, results are different from test to test.
# That's okay, because we test only that select doesn't yield an # That's okay, because we test only that select doesn't yield an
# error. Note, that --disable_result_log doesn't suppress error output. # error. Note, that --disable_result_log doesn't suppress error output.
--disable_result_log --disable_result_log
SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp; SELECT COUNT(DISTINCT id) FROM t1 GROUP BY grp;
--enable_result_log --enable_result_log
--echo # Begin cleanup
SET session myisam_sort_buffer_size = @orig_myisam_sort_buffer_size;
DROP TABLE t1; DROP TABLE t1;
set @@read_buffer_size=default;
# End of 4.1 tests # End of 4.1 tests