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

Fix manual merge.

Browse Source
This commit is contained in:
unknown 2008-03-12 23:07:10 +03:00
parent b279be388e
commit 054341a6d0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_delete.cc
View File

@ -103,10 +103,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
/* Error evaluating val_int(). */ /* Error evaluating val_int(). */
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
/* NOTE: TRUNCATE must not invoke triggers. */
triggers_applicable= table->triggers &&
thd->lex->sql_command != SQLCOM_TRUNCATE;
/* /*
Test if the user wants to delete all rows and deletion doesn't have Test if the user wants to delete all rows and deletion doesn't have
@ -129,9 +125,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
*/ */
if (!using_limit && const_cond_result && if (!using_limit && const_cond_result &&
!(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) &&
!(triggers_applicable && (thd->lex->sql_command == SQLCOM_TRUNCATE ||
thd->current_stmt_binlog_row_based && (!thd->current_stmt_binlog_row_based &&
table->triggers->has_delete_triggers())) !(table->triggers && table->triggers->has_delete_triggers()))))
{ {
/* Update the table->file->stats.records number */ /* Update the table->file->stats.records number */
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
@ -255,6 +251,12 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
init_ftfuncs(thd, select_lex, 1); init_ftfuncs(thd, select_lex, 1);
thd_proc_info(thd, "updating"); thd_proc_info(thd, "updating");
/* NOTE: TRUNCATE must not invoke triggers. */
triggers_applicable= table->triggers &&
thd->lex->sql_command != SQLCOM_TRUNCATE;
if (triggers_applicable && if (triggers_applicable &&
table->triggers->has_triggers(TRG_EVENT_DELETE, table->triggers->has_triggers(TRG_EVENT_DELETE,
TRG_ACTION_AFTER)) TRG_ACTION_AFTER))