Backport Bug#37148 to 5.1

This commit is contained in:
He Zhenxing 2010-01-24 15:03:23 +08:00
commit 2b16517522
28 changed files with 472 additions and 159 deletions

View file

@ -1790,6 +1790,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount,
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,
"Invoked ROUTINE modified a transactional table but MySQL "
"failed to reflect this change in the binary log");
err_status= TRUE;
}
reset_dynamic(&thd->user_var_events);
/* Forget those values, in case more function calls are binlogged: */