bk commit into 5.0 tree (konstantin:1.1937)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1937 05/07/15 02:13:08 konstantin@stripped +1 -0
  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
    1.49 05/07/15 02:13:03 konstantin@stripped +2 -2
    Manual merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root/RESYNC

--- 1.48/mysql-test/t/ps.test	2005-07-15 00:41:51 +04:00
+++ 1.49/mysql-test/t/ps.test	2005-07-15 02:13:03 +04:00
@@ -815,10 +815,12 @@
 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;