Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1

mysql-test/r/func_gconcat.result

@@ -168,8 +168,8 @@ insert into T_REQUEST values (1,4), (5,4), (5,5);
 select REQ_ID, Group_Concat(URL) as URL from T_URL, T_REQUEST where 
 T_REQUEST.URL_ID = T_URL.URL_ID group by REQ_ID;
 REQ_ID	URL
-1	www.host.com
-5	www.google.com,www.help.com,www.host.com
+1	X
+5	X,X,X
 drop table T_URL;
 drop table T_REQUEST;
 select group_concat(sum(a)) from t1 group by grp;

mysql-test/t/func_gconcat.test

@@ -78,6 +78,8 @@ drop table if exists T_REQUEST;
 create table T_REQUEST ( REQ_ID int(11), URL_ID int(11));
 insert into T_URL values (4,'www.host.com'), (5,'www.google.com'),(5,'www.help.com');
 insert into T_REQUEST values (1,4), (5,4), (5,5);
+# Make this order independent
+--replace_result www.help.com X www.host.com X www.google.com X
 select REQ_ID, Group_Concat(URL) as URL from T_URL, T_REQUEST where 
 T_REQUEST.URL_ID = T_URL.URL_ID group by REQ_ID;
 drop table T_URL;