bk commit into 5.0 tree (pem:1.2074) BUG#17843

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.2074 06/03/23 16:32:45 pem@stripped +1 -0
  Fixed BUG#17843: Certain stored procedures fail to run at startup
    Set client_capabilites|=CLIENT_MULTI_RESULTS in
    sql_parse.cc:handle_bootstrap(). There is no "client" really, but this makes
    it behave consistently; the prepared statements that can be called directly
    in the init-file can be used in a stored procedure too.
    There is no easy way to test this in the automatic test suite, so no test
    case can be provided in the patch - it has to be tested manually.

  sql/sql_parse.cc
    1.533 06/03/23 16:32:30 pem@stripped +5 -0
    Set CLIENT_MULTI_RESULTS in handle_bootstrap(), to make prepared
    statements work in stored procedures called from init-file.

# 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/5.0/bug17843/mysql-5.0-runtime

--- 1.532/sql/sql_parse.cc	2006-03-02 13:18:45 +01:00
+++ 1.533/sql/sql_parse.cc	2006-03-23 16:32:30 +01:00
@@ -1233,6 +1233,11 @@
   thd->version=refresh_version;
   thd->security_ctx->priv_user=
     thd->security_ctx->user= (char*) my_strdup("boot", MYF(MY_WME));
+  /*
+    Make the "client" handle multiple results. This makes CALLing a stored
+    procedure containing prepared functions work.
+  */
+  thd->client_capabilities|= CLIENT_MULTI_RESULTS;
 
   buff= (char*) thd->net.buff;
   thd->init_for_queries();