diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-10-26 15:48:08 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-10-26 15:48:08 +0400 |
| commit | e86b6c0db40116cb0dc223999e45712e1b1908ef (patch) | |
| tree | 70a95b383eccf00cc30e660b5ea8e69631fca815 /sql/sp_head.h | |
| parent | b431da62147ed8d1ed5433c810a92ed6eadcbf27 (diff) | |
| download | mariadb-git-e86b6c0db40116cb0dc223999e45712e1b1908ef.tar.gz | |
Patch for Bug#55850 (Trigger warnings not cleared).
The problem was that the warnings risen by a trigger were not cleared upon
successful completion. The warnings should be cleared if the trigger completes
successfully.
The fix is to skip merging warnings into caller's Warning Info for triggers.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index e72ce6455f6..5efd48fc7c6 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -527,7 +527,7 @@ private: HASH m_sptabs; bool - execute(THD *thd); + execute(THD *thd, bool merge_da_on_success); /** Perform a forward flow analysis in the generated code. |