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

into mysql.com:/home/psergey/mysql-5.0-aug28-vg
This commit is contained in:
sergefp@mysql.com 2005-08-28 20:26:42 +04:00
commit e4ce706cf9

View file

@ -1055,7 +1055,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
if (need_binlog_call)
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];
String bufstr(buf, sizeof(buf), &my_charset_bin);