Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt

into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt


mysql-test/t/select.test:
  Auto merged

mysql-test/t/select.test

@@ -3454,6 +3454,8 @@ DROP TABLE t1;
 #             truncation of one-space column names to zero length names.
 #
 
+--disable_ps_protocol
+
 SELECT 1 AS ` `;
 SELECT 1 AS `  `;
 SELECT 1 AS ` x`;
@@ -3469,4 +3471,6 @@ SELECT `x` FROM v3;
 
 DROP VIEW v1, v2, v3;
 
+--enable_ps_protocol
+
 --echo End of 5.0 tests