bk commit into 5.1 tree (guilhem:1.2370)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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@stripped, 2007-01-08 22:06:19+01:00, guilhem@stripped +3 -0
  Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-19725
  into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725
  MERGE: 1.1810.2362.27

  mysql-test/r/rpl_sp.result@stripped, 2007-01-08 22:03:32+01:00, guilhem@stripped +109
-152
    using 5.1's version, will merge by hand after running the new test
    MERGE: 1.13.2.8

  mysql-test/t/rpl_sp.test@stripped, 2007-01-08 22:05:58+01:00, guilhem@stripped +6 -40
    using 5.1's version, will re-insert the new test portion by hand
    MERGE: 1.9.2.7

  sql/sp_head.cc@stripped, 2007-01-08 22:03:24+01:00, guilhem@stripped +0 -0
    Auto merged
    MERGE: 1.200.1.28

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-rpl-19725/RESYNC

--- 1.246/sql/sp_head.cc	2007-01-08 22:06:25 +01:00
+++ 1.247/sql/sp_head.cc	2007-01-08 22:06:25 +01:00
@@ -1472,6 +1472,8 @@ sp_head::execute_function(THD *thd, Item
   {
     binlog_buf.length(0);
     binlog_buf.append(STRING_WITH_LEN("SELECT "));
+    append_identifier(thd, &binlog_buf, m_db.str, m_db.length);
+    binlog_buf.append('.');
     append_identifier(thd, &binlog_buf, m_name.str, m_name.length);
     binlog_buf.append('(');
     for (arg_no= 0; arg_no < argcount; arg_no++)