diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:20:41 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:20:41 +0300 |
| commit | c063bd171e4eb4067e6684b77277e170b7a668bc (patch) | |
| tree | 8b36c387d70977c948b7d1412fcd7d9b940852af /sql/sql_prepare.cc | |
| parent | b40aed07bffb6fa37fc03ccd063b5a189e8ddb71 (diff) | |
| parent | 754dee8e51950365956efb793af34a769cbd4792 (diff) | |
| download | mariadb-git-c063bd171e4eb4067e6684b77277e170b7a668bc.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6d7b94cad21..edeba1da3b9 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2343,6 +2343,9 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) /* Fix ORDER list */ for (order= (ORDER *)sl->order_list.first; order; order= order->next) order->item= &order->item_ptr; + + /* clear the no_error flag for INSERT/UPDATE IGNORE */ + sl->no_error= FALSE; } { SELECT_LEX_UNIT *unit= sl->master_unit(); |