diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-11-18 17:48:45 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-11-18 17:48:45 +0200 |
| commit | ca29aa5413baf7d7105a380b2cfbfa308ed2ade8 (patch) | |
| tree | c14d768a9f406acc7ac48939778506ec853df4c8 /sql | |
| parent | cde9c4299b1f77abed719dbacb278030010760e6 (diff) | |
| parent | 900d00c866cda6c082b909bc257411f5bd57abd4 (diff) | |
| download | mariadb-git-ca29aa5413baf7d7105a380b2cfbfa308ed2ade8.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
mysql-test/r/subselect.result:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 3 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index eccf0e6dbe0..4bab7be255c 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -66,6 +66,9 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, DBUG_RETURN(1); } + if (thd->lex.duplicates == DUP_IGNORE) + thd->lex.select_lex.no_error= 1; + /* Test if the user wants to delete all rows */ if (!using_limit && const_cond && (!conds || conds->val_int()) && !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE))) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 469fe932d92..7f5ff73f283 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3904,7 +3904,8 @@ opt_delete_options: opt_delete_option: QUICK { Select->options|= OPTION_QUICK; } - | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; }; + | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; } + | IGNORE_SYM { Lex->duplicates= DUP_IGNORE; }; truncate: TRUNCATE_SYM opt_table_sym table_name |