summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2009-06-18 15:16:14 +0100
committerAlfranio Correia <alfranio.correia@sun.com>2009-06-18 15:16:14 +0100
commitf45b12dc5ec06757d0edfee84555fdf556f0d36f (patch)
tree89fe2ff5fc4051f4f0ca5e9189694980ff51c96d /sql/sql_delete.cc
parent37b2b7fadbd0abc108467eb81cb8840dcd63fd3a (diff)
parent3cf052b76cb62a3efbb29d4086a893f7f0d37d94 (diff)
downloadmariadb-git-f45b12dc5ec06757d0edfee84555fdf556f0d36f.tar.gz
auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 01db6ac2b9c..b20ff78b9ba 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -408,7 +408,7 @@ cleanup:
thd->query, thd->query_length,
is_trans, FALSE, errcode);
- if (log_result && transactional_table)
+ if (log_result)
{
error=1;
}