Commit f02d34dd authored by unknown's avatar unknown

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-aug28-vg

parents e239939e 1c49a01e
...@@ -1055,7 +1055,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp) ...@@ -1055,7 +1055,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
if (need_binlog_call) if (need_binlog_call)
mysql_bin_log.stop_union_events(thd); mysql_bin_log.stop_union_events(thd);
if (thd->binlog_evt_union.unioned_events && mysql_bin_log.is_open()) if (need_binlog_call && thd->binlog_evt_union.unioned_events)
{ {
char buf[256]; char buf[256];
String bufstr(buf, sizeof(buf), &my_charset_bin); String bufstr(buf, sizeof(buf), &my_charset_bin);
......
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