1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix manual merge.

Browse Source
This commit is contained in:
anozdrin/alik@quad. 2008-03-12 16:50:24 +03:00
parent 44d814f58c
commit e57679c204
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_delete.cc
View File

@ -129,9 +129,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
*/
if (!using_limit && const_cond_result &&
!(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
!triggers_applicable &&
!thd->current_stmt_binlog_row_based &&
!table->triggers->has_delete_triggers())
!(triggers_applicable &&
thd->current_stmt_binlog_row_based &&
table->triggers->has_delete_triggers()))
{
/* Update the table->file->stats.records number */
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);