mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Bug #27716 multi-update did partially and has not binlogged
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode. mysql-test/r/innodb.result: results changed because of some more queries are added mysql-test/r/multi_update.result: results changed mysql-test/r/rpl_row_basic_11bugs.result: results changed mysql-test/t/innodb.test: error code is diff in 5.0 mysql-test/t/multi_update.test: making explicit comments and forcing execution in mixed (stmt) mode. mysql-test/t/rpl_row_basic_11bugs.test: checking how binlogging works when a query on non-ta table completed partly. sql/sql_update.cc: manual merge after authomatic one failed (semantic drift)
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user