diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-23 19:30:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-23 19:30:44 +0300 |
| commit | 5ce4825b63997f6db76a12b0f764d175734699fb (patch) | |
| tree | 0d2b9b95d1eb2c047e4337fda92a3aa58471e62a /sql/sql_delete.cc | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| download | mariadb-git-5ce4825b63997f6db76a12b0f764d175734699fb.tar.gz | |
Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable things that are proven stable or enable things that are not usefull.
sql/field.cc:
Remove feature of 'new_mode' that was never implemtented in a newer MySQL version.
sql/item_cmpfunc.cc:
Boyer more is stable; Don't have to be protected by --skip-new anymore
sql/mysqld.cc:
Don't disable some proven stable functions with --skip-new
sql/records.cc:
Don't disable record caching with --safe-mode anymore
sql/sql_delete.cc:
Do fast truncate even if --skip-new or --safe is used
sql/sql_parse.cc:
Use always mysql_optimizer() for optimizer (instead of mysql_recreate_table() in case of --safe or --skip-new)
sql/sql_select.cc:
Don't disable 'only_eq_ref_tables' if --safe is used.
sql/sql_yacc.yy:
Removed not meaningfull test of --old
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 361a5db1f2c..5564d628594 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -130,7 +130,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, - there should be no delete triggers associated with the table. */ if (!using_limit && const_cond_result && - !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && (thd->lex->sql_command == SQLCOM_TRUNCATE || (!thd->current_stmt_binlog_row_based && !(table->triggers && table->triggers->has_delete_triggers())))) |