Merge mysql.com:/opt/local/work/mysql-4.1-root

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/t/ps.test:
  Manual merge

mysql-test/t/ps.test

@@ -815,10 +815,12 @@ prepare stmt from "select ?FROM t1";
 prepare stmt from "select FROM t1 WHERE?=1";
 --error 1064
 prepare stmt from "update t1 set a=a+?WHERE 1";
+--disable_ps_protocol
 --error 1064
 select ?;
 --error 1064
 select ??;
 --error 1064
 select ? from t1;
+--enable_ps_protocol
 drop table t1;