diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
| commit | 5aa4c33e3233e2c1cac9f3bb0b17379a56503666 (patch) | |
| tree | 5bb7d787b7b4c25140afb74590153f8109510d61 /sql/sp_head.cc | |
| parent | b436e0ae20da93f6ebf3231ac28f397966187175 (diff) | |
| parent | dad4291b781495cfdc8abac9dc2902621bfb3b56 (diff) | |
| download | mariadb-git-5aa4c33e3233e2c1cac9f3bb0b17379a56503666.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysql_priv.h
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 6b62949f4fe..efe87110194 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1807,6 +1807,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: */ |