5.1-sucurity->5.5-security merge

mysql-test/t/func_gconcat.test

@@ -744,8 +744,10 @@ DROP TABLE t1;
 
 CREATE TABLE t1(f1 int);
 INSERT INTO t1 values (0),(0);
+--disable_ps_protocol
 --error ER_ILLEGAL_VALUE_FOR_TYPE
 SELECT POLYGON((SELECT 1 FROM (SELECT 1 IN (GROUP_CONCAT(t1.f1)) FROM t1, t1 t GROUP BY t.f1 ) d));
+--enable_ps_protocol
 DROP TABLE t1;
 
 --echo End of 5.1 tests