bk commit into 5.0 tree (dlenev:1.1961) BUG#10055

[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.1961 05/08/09 12:56:55 dlenev@stripped +1 -0
  Fix after merging patch solving bug #10055 "Using stored function with
  information_schema causes empty result set" with main tree.

  sql/sp_head.cc
    1.163 05/08/09 12:56:48 dlenev@stripped +1 -1
    Now close_thread_tables() does not have 4th 'stopper' argument.

# 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-is

--- 1.162/sql/sp_head.cc	2005-08-03 07:44:29 +04:00
+++ 1.163/sql/sp_head.cc	2005-08-09 12:56:48 +04:00
@@ -929,7 +929,7 @@
       we'll leave it here.
     */
     if (!thd->in_sub_stmt)
-      close_thread_tables(thd, 0, 0, 0);
+      close_thread_tables(thd, 0, 0);
 
     DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));
     // The rest of the frame are local variables which are all IN.