summaryrefslogtreecommitdiff
path: root/sql/sql_insert.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_insert.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_insert.cc')
-rw-r--r--sql/sql_insert.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 335332918e4..4c7f7eb889a 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -896,8 +896,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
if (thd->binlog_query(THD::ROW_QUERY_TYPE,
thd->query, thd->query_length,
transactional_table, FALSE,
- errcode) &&
- transactional_table)
+ errcode))
{
error=1;
}