diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-02 14:26:53 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-02-02 14:26:53 +0400 |
| commit | c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 (patch) | |
| tree | f739065597ee9d3d9c36cc8e9c7d747c2bd99aad /sql/sql_delete.cc | |
| parent | ed0e4a968a4dfba3788bc270c73620f3e498dca5 (diff) | |
| download | mariadb-git-c01bbd33d79ac5f7ba822a3c8cadb0c31364e366.tar.gz | |
after merge fix
mysql-test/r/ndb_read_multi_range.result:
result fix
mysql-test/t/ndb_read_multi_range.test:
test case fix
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 7daf3be1578..ea8c0e2d83e 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -75,8 +75,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, if (!using_limit && const_cond && (!conds || conds->val_int()) && !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && (thd->lex->sql_command == SQLCOM_TRUNCATE || - !(table->triggers && table->triggers->has_delete_triggers())) - ) + !(table->triggers && table->triggers->has_delete_triggers())) && + !thd->current_stmt_binlog_row_based) { /* Update the table->file->stats.records number */ table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); |