diff options
| author | monty@mysql.com <> | 2004-12-31 12:05:43 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-31 12:05:43 +0200 |
| commit | 78da7196ad70f922a8209b969fef91f90cb448e2 (patch) | |
| tree | aa9ad4f333f053e73bd7d0f82cc1a3677636ed4a /sql/sql_delete.cc | |
| parent | f455778fc12bdb8e940ab0add095946864f96801 (diff) | |
| parent | 1bd22faa05c03dfb19916a92266fb5b45768d3f6 (diff) | |
| download | mariadb-git-78da7196ad70f922a8209b969fef91f90cb448e2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 29d86a99ff3..8b4a0f0f6d0 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -57,8 +57,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, DBUG_RETURN(1); } - if (thd->lex->duplicates == DUP_IGNORE) - thd->lex->select_lex.no_error= 1; + thd->lex->select_lex.no_error= thd->lex->ignore; /* Test if the user wants to delete all rows */ if (!using_limit && const_cond && (!conds || conds->val_int()) && |