summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authoraelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi <>2007-06-04 15:02:40 +0300
committeraelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi <>2007-06-04 15:02:40 +0300
commitf54428678995fa715d79d4ec0df766324300b001 (patch)
treec920637995bb9acac3301616aa306510ab860726 /sql
parent798b38a447222069b356f2012a73b617b0e94c66 (diff)
downloadmariadb-git-f54428678995fa715d79d4ec0df766324300b001.tar.gz
Bug #27716 multi-update did partially and has not binlogged
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_update.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index c51f7558280..faa5d576e04 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1589,9 +1589,9 @@ void multi_update::send_error(uint errcode,const char *err)
*/
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length,
- transactional_tables, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::ROW_QUERY_TYPE,
+ thd->query, thd->query_length,
+ transactional_tables, FALSE);
}
if (!trans_safe)
thd->no_trans_update.all= TRUE;