diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 12:39:22 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-08-04 12:39:22 +0200 |
| commit | dbd205797b7ee4373972d9d2014bf24e5a01b094 (patch) | |
| tree | 847d2c6742d61a4d27517f6516a70d11b19707ba /sql/log_event.cc | |
| parent | 35a019837e0290af45962484b4ddc1d6a92ac654 (diff) | |
| parent | 9b9c5e890c16176eaf6b54d466708c54e2df7c9d (diff) | |
| download | mariadb-git-dbd205797b7ee4373972d9d2014bf24e5a01b094.tar.gz | |
Merge MDEV-8302 into 10.1
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 87fa145d730..786b249db39 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -4234,7 +4234,6 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi, "mysql", rpl_gtid_slave_state_table_name.str, errcode, thd->get_stmt_da()->message()); - trans_rollback(thd); sub_id= 0; thd->is_slave_error= 1; goto end; @@ -7365,7 +7364,6 @@ int Xid_log_event::do_apply_event(rpl_group_info *rgi) "%s.%s: %d: %s", "mysql", rpl_gtid_slave_state_table_name.str, ec, thd->get_stmt_da()->message()); - trans_rollback(thd); thd->is_slave_error= 1; return err; } |