diff options
| author | unknown <gkodinov@mysql.com> | 2006-03-27 12:35:16 +0300 |
|---|---|---|
| committer | unknown <gkodinov@mysql.com> | 2006-03-27 12:35:16 +0300 |
| commit | 7c641b686a8f1f32c70c49919e72526d9d3db944 (patch) | |
| tree | 451a9ea7f6d8c50c7df2ccaf842d858c2c368b11 | |
| parent | 3cbae11cfdbc5f164724eb1d362a5bb84c6ae010 (diff) | |
| parent | b3230cc265ce456f3ec007deaac7d0f72d564075 (diff) | |
| download | mariadb-git-7c641b686a8f1f32c70c49919e72526d9d3db944.tar.gz | |
Merge mysql.com:/home/kgeorge/mysql/5.0/B15102
into mysql.com:/home/kgeorge/mysql/5.1/B15102
netware/BUILD/compile-netware-START:
Auto merged
| -rw-r--r-- | mysql-test/r/group_min_max.result | 37 | ||||
| -rw-r--r-- | mysql-test/t/group_min_max.test | 38 | ||||
| -rwxr-xr-x | netware/BUILD/compile-netware-START | 1 |
3 files changed, 75 insertions, 1 deletions
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index b1703c51f4e..b889d031079 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -2070,3 +2070,40 @@ SELECT a FROM t1 WHERE a LIKE 'B%' GROUP BY a; a BB DROP TABLE t1; +CREATE TABLE t1 ( +a int(11) NOT NULL DEFAULT '0', +b varchar(16) COLLATE latin1_general_ci NOT NULL DEFAULT '', +PRIMARY KEY (a,b) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +CREATE PROCEDURE a(x INT) +BEGIN +DECLARE rnd INT; +DECLARE cnt INT; +WHILE x > 0 DO +SET rnd= x % 100; +SET cnt = (SELECT COUNT(*) FROM t1 WHERE a = rnd); +INSERT INTO t1(a,b) VALUES (rnd, CAST(cnt AS CHAR)); +SET x= x - 1; +END WHILE; +END| +CALL a(1000); +SELECT a FROM t1 WHERE a=0; +a +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 +SELECT DISTINCT a FROM t1 WHERE a=0; +a +0 +SELECT COUNT(DISTINCT a) FROM t1 WHERE a=0; +COUNT(DISTINCT a) +1 +DROP TABLE t1; +DROP PROCEDURE a; diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test index 8dc55532bbf..0f0a632ff67 100644 --- a/mysql-test/t/group_min_max.test +++ b/mysql-test/t/group_min_max.test @@ -736,3 +736,41 @@ SELECT DISTINCT a FROM t1 WHERE a LIKE 'B%'; SELECT a FROM t1 WHERE a LIKE 'B%' GROUP BY a; DROP TABLE t1; + + +# +# Bug #15102: select distinct returns empty result, select count +# distinct > 0 (correct) +# + +CREATE TABLE t1 ( + a int(11) NOT NULL DEFAULT '0', + b varchar(16) COLLATE latin1_general_ci NOT NULL DEFAULT '', + PRIMARY KEY (a,b) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; + +delimiter |; + +CREATE PROCEDURE a(x INT) +BEGIN + DECLARE rnd INT; + DECLARE cnt INT; + + WHILE x > 0 DO + SET rnd= x % 100; + SET cnt = (SELECT COUNT(*) FROM t1 WHERE a = rnd); + INSERT INTO t1(a,b) VALUES (rnd, CAST(cnt AS CHAR)); + SET x= x - 1; + END WHILE; +END| + +DELIMITER ;| + +CALL a(1000); + +SELECT a FROM t1 WHERE a=0; +SELECT DISTINCT a FROM t1 WHERE a=0; +SELECT COUNT(DISTINCT a) FROM t1 WHERE a=0; + +DROP TABLE t1; +DROP PROCEDURE a; diff --git a/netware/BUILD/compile-netware-START b/netware/BUILD/compile-netware-START index 2a8182d61e7..95b222994d3 100755 --- a/netware/BUILD/compile-netware-START +++ b/netware/BUILD/compile-netware-START @@ -26,4 +26,3 @@ base_configs=" \ --without-man \ --without-csv-storage-engine \ " - |