Commit 9addd5f7 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
parents e6145414 1073271b

mysql-test/r/func_gconcat.result

+91 −0
Original line number Diff line number Diff line
@@ -366,3 +366,94 @@ A_ID B_DESC 
3	F

DROP TABLE t1;

DROP TABLE t2;

create table t1 (a int, b text);

insert into t1 values (1, 'bb'), (1, 'ccc'), (1, 'a'), (1, 'bb'), (1, 'ccc');

insert into t1 values (2, 'BB'), (2, 'CCC'), (2, 'A'), (2, 'BB'), (2, 'CCC');

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc

BB,CCC,A,BB,CCC

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a

BB,CCC,A

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

a,bb,bb,ccc,ccc

A,BB,BB,CCC,CCC

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

a,bb,ccc

A,BB,CCC

set local group_concat_max_len=4;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,c

BB,C

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,c

BB,C

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

a,bb

A,BB

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

a,bb

A,BB

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

insert into t1 values (1, concat(repeat('1', 300), '2')), 

(1, concat(repeat('1', 300), '2')), (1, concat(repeat('0', 300), '1')), 

(2, concat(repeat('1', 300), '2')), (2, concat(repeat('1', 300), '2')), 

(2, concat(repeat('0', 300), '1'));

set local group_concat_max_len=1024;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

BB,CCC,A,BB,CCC,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

BB,CCC,A,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,a,bb,bb,ccc,ccc

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,A,BB,BB,CCC,CCC

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,a,bb,ccc

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,A,BB,CCC

set local group_concat_max_len=400;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111

BB,CCC,A,BB,CCC,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

BB,CCC,A,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

drop table t1;

mysql-test/r/outfile.result

0 → 100644
+10 −0
Original line number Diff line number Diff line 
drop table if exists t1;

CREATE TABLE t1 (a INT);

EXPLAIN 

SELECT *

INTO OUTFILE '/tmp/t1.txt'

  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n'

  FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	0	const row not found

DROP TABLE t1;

mysql-test/r/query_cache.result

+2 −0
Original line number Diff line number Diff line
@@ -901,6 +901,8 @@ set group_concat_max_len=10; 
select group_concat(a) FROM t1 group by b;

group_concat(a)

1234567890

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

set group_concat_max_len=1024;

select group_concat(a) FROM t1 group by b;

group_concat(a)

mysql-test/t/func_gconcat.test

+37 −0
Original line number Diff line number Diff line
@@ -240,3 +240,40 @@ SELECT t1.A_ID, GROUP_CONCAT(t2.B_DESC) AS B_DESC FROM t1 LEFT JOIN t2 ON t1.A_I 
DROP TABLE t1;

DROP TABLE t2;



#

# blobs

#



create table t1 (a int, b text);

insert into t1 values (1, 'bb'), (1, 'ccc'), (1, 'a'), (1, 'bb'), (1, 'ccc');

insert into t1 values (2, 'BB'), (2, 'CCC'), (2, 'A'), (2, 'BB'), (2, 'CCC');

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;

set local group_concat_max_len=4;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;



#

# long blobs

#



insert into t1 values (1, concat(repeat('1', 300), '2')), 

(1, concat(repeat('1', 300), '2')), (1, concat(repeat('0', 300), '1')), 

(2, concat(repeat('1', 300), '2')), (2, concat(repeat('1', 300), '2')), 

(2, concat(repeat('0', 300), '1'));

set local group_concat_max_len=1024;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;

set local group_concat_max_len=400;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;



drop table t1;

mysql-test/t/outfile.test

+16 −1
Original line number Diff line number Diff line
@@ -2,9 +2,12 @@ 
# test of into outfile|dumpfile

#



--disable_warnings

drop table if exists t1;

--enable_warnings



# We need to check that we have 'file' privilege.



#drop table if exists t1;

#create table t1 (`a` blob);

#insert into t1 values("hello world"),("Hello mars"),(NULL);

#select * into outfile "/tmp/select-test.1" from t1;
@@ -26,3 +29,15 @@ 
#INSERT INTO t VALUES ('2002-12-20 12:01:20','',1,"aaa","bbb");

#select * from t into outfile "check";

#drop table if exists t;



#

# Bug #5382: 'explain select into outfile' crashes the server

#



CREATE TABLE t1 (a INT);

EXPLAIN 

  SELECT *

  INTO OUTFILE '/tmp/t1.txt'

  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n'

  FROM t1;

DROP TABLE t1;