Commit 3357d89b authored by unknown's avatar unknown
Browse files

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
parents ef095886 951dacdc

mysql-test/t/ps.test

+2 −0
Original line number Diff line number Diff line
@@ -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;