Skip to content

Commit

Permalink
Merge pull request #69 from vlad-lesin/5.6-bug-1438990
Browse files Browse the repository at this point in the history
post-push fix for lp:1438990
  • Loading branch information
laurynas-biveinis committed May 7, 2015
2 parents 185304c + e7920f0 commit a53b385
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sql/handler.cc
Expand Up @@ -2141,7 +2141,7 @@ int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)

/*
Write tables map once more for trigger as it will be wiped out in
Write_rows_log_event::write_row() on slave.
Query_log_event::do_apply_event() on slave.
*/
if (thd->in_sub_stmt == SUB_STMT_TRIGGER)
error= write_locked_table_maps(thd, true);
Expand Down Expand Up @@ -2244,7 +2244,7 @@ int ha_savepoint(THD *thd, SAVEPOINT *sv)

/*
Write tables map once more for trigger as it will be wiped out in
Write_rows_log_event::write_row() on slave.
Query_log_event::do_apply_event() on slave.
*/
if (thd->in_sub_stmt == SUB_STMT_TRIGGER)
error= write_locked_table_maps(thd, true);
Expand Down

0 comments on commit a53b385

Please sign in to comment.