diff options
author | Michael Widenius <monty@askmonty.org> | 2011-12-11 18:39:33 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 18:39:33 +0200 |
commit | 148587461954b544355bc808a89bfed1a70694e1 (patch) | |
tree | 2fd1f7b65e3a4ce21719a5f66f6617a89ff9ab7e /sql/sql_prepare.cc | |
parent | 6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b (diff) | |
download | mariadb-git-148587461954b544355bc808a89bfed1a70694e1.tar.gz |
Rewrite IGNORE handling:
- Instead of supressing all errors, only suppress safe ones like:
ER_DUP_KEY, ER_BAD_NULL_ERROR, ER_SUBQUERY_NO_1_ROW, ER_ROW_IS_REFERENCED_2
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index c03ed12cc96..611c8ddf944 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2460,9 +2460,6 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) for (order= sl->order_list.first; order; order= order->next) order->item= &order->item_ptr; sl->handle_derived(lex, DT_REINIT); - - /* clear the no_error flag for INSERT/UPDATE IGNORE */ - sl->no_error= FALSE; } { SELECT_LEX_UNIT *unit= sl->master_unit(); |