bk commit into 5.0 tree (dlenev:1.1853)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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.1853 05/02/15 22:17:44 dlenev@stripped +1 -0
  Temporary disabling part of test which fails in --ps-protocol mode.

  mysql-test/t/sp.test
    1.99 05/02/15 22:17:39 dlenev@stripped +8 -0
    Temporary disabling part of test which fails in --ps-protocol mode.

# 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:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0

--- 1.98/mysql-test/t/sp.test	Tue Feb  8 22:52:40 2005
+++ 1.99/mysql-test/t/sp.test	Tue Feb 15 22:17:39 2005
@@ -2811,6 +2811,12 @@
 #
 # BUG#5240: Stored procedure crash if function has cursor declaration
 #
+# The following test case fails in --ps-protocol mode due to some bugs
+# in algorithm which calculates list of tables to be locked for queries
+# using Stored Functions. It is disabled until Dmitri fixes this.
+#
+--disable_ps_protocol
+
 --disable_warnings
 drop function if exists bug5240|
 --enable_warnings
@@ -2830,6 +2836,8 @@
 # QQ BUG: This returns the wrong result, id=42 instead of "answer".
 select id, bug5240() from t1|
 drop function bug5240|
+
+--enable_ps_protocol
 
 #
 # BUG#5278: Stored procedure packets out of order if SET PASSWORD.