summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authordlenev@brandersnatch.localdomain <>2005-06-07 14:53:08 +0400
committerdlenev@brandersnatch.localdomain <>2005-06-07 14:53:08 +0400
commit270b695f59b49aca75fbfc83c6635ee6efd8b8df (patch)
treec7c9f9e62a48bf969fc8619952d6c3f850600695 /sql/share
parent329d974df743975d4f898dbb8fc7a31fca818f6b (diff)
downloadmariadb-git-270b695f59b49aca75fbfc83c6635ee6efd8b8df.tar.gz
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
We should not allow explicit or implicit transaction commits inside of stored functions or triggers (so in autocommit mode we should not do commits after execution of sub-statement). Also since we don't support nested statement transactions in 5.0, we shouldn't commit or rollback stmt transactions while we are inside stored functions or triggers. This should be fixed in later (>=5.1) releases.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 848cc422dc2..a020cadc084 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5356,3 +5356,5 @@ ER_EXEC_STMT_WITH_OPEN_CURSOR
eng "You can't execute a prepared statement which has an open cursor associated with it. Reset the statement to re-execute it."
ER_STMT_HAS_NO_OPEN_CURSOR
eng "The statement (%d) has no open cursor."
+ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+ eng "Explicit or implicit commit is not allowed in stored function or trigger."