diff options
author | Martin Hansson <martin.hansson@sun.com> | 2010-02-10 15:37:34 +0100 |
---|---|---|
committer | Martin Hansson <martin.hansson@sun.com> | 2010-02-10 15:37:34 +0100 |
commit | 630fa243c9a459526e225acc19fee30f4676a505 (patch) | |
tree | 9b0fa35b8e58886b80c4cd6e6d3b538098387d92 /sql/sql_class.h | |
parent | f2c5870f2a94fb818010a874d04f1c7ceac80282 (diff) | |
download | mariadb-git-630fa243c9a459526e225acc19fee30f4676a505.tar.gz |
Bug#49534: multitable IGNORE update with sql_safe_updates
error causes debug assertion
The IGNORE option of the multiple-table UPDATE command was
not intended to suppress errors caused by the
sql_safe_updates mode. This flag will raise an error if the
execution of UPDATE does not use a key for row retrieval,
and should continue do so regardless of the IGNORE option.
However the implementation of IGNORE does not support
exceptions to the rule; it always converts errors to
warnings and cannot be extended. The Internal_error_handler
interface offers the infrastructure to handle individual
errors, making sure that the error raised by
sql_safe_updates is not silenced.
Fixed by implementing an Internal_error_handler and using it
for UPDATE IGNORE commands.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 77b4aa6c1d0..032985dc44e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2313,7 +2313,7 @@ public: /** Remove the error handler last pushed. */ - void pop_internal_handler(); + Internal_error_handler *pop_internal_handler(); /** Overloaded to guard query/query_length fields */ virtual void set_statement(Statement *stmt); |