Commit d101463e authored by unknown's avatar unknown

Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-19725

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725


sql/sp_head.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  using 5.1's version, will merge by hand after running the new test
mysql-test/t/rpl_sp.test:
  using 5.1's version, will re-insert the new test portion by hand
parents 7dba7404 3a05847a
...@@ -1472,6 +1472,8 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, ...@@ -1472,6 +1472,8 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount,
{ {
binlog_buf.length(0); binlog_buf.length(0);
binlog_buf.append(STRING_WITH_LEN("SELECT ")); 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); append_identifier(thd, &binlog_buf, m_name.str, m_name.length);
binlog_buf.append('('); binlog_buf.append('(');
for (arg_no= 0; arg_no < argcount; arg_no++) for (arg_no= 0; arg_no < argcount; arg_no++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment