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

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

Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
fbf35e0e · konstantin@mysql.com · 60e7d6ff · a4a5bc42 · fbf35e0e
Commit fbf35e0e authored Jul 15, 2005 by konstantin@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/t/ps.test mysql-test/t/ps.test +2 -0

No files found.
--- a/mysql-test/t/ps.test
+++ b/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;