diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
| commit | e1fb88f2cc6ac8350319a5c88810779573f381b3 (patch) | |
| tree | 7c9e10584a78c52b65d034c06dabe900f6c2c349 /sql/log_event.cc | |
| parent | 88e84c1fbfe9b60eeb9c3d24745ee31cfe29c38b (diff) | |
| parent | 5dd1abae7d2f9e56d1c3f54077057bd92387a600 (diff) | |
| download | mariadb-git-e1fb88f2cc6ac8350319a5c88810779573f381b3.tar.gz | |
Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 651cd1418e3..2d4a5c3a98d 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3008,7 +3008,10 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli, ::do_apply_event(), then the companion SET also have so we don't need to reset_one_shot_variables(). */ - if (rpl_filter->db_ok(thd->db)) + if (!strncmp(query_arg, "BEGIN", q_len_arg) || + !strncmp(query_arg, "COMMIT", q_len_arg) || + !strncmp(query_arg, "ROLLBACK", q_len_arg) || + rpl_filter->db_ok(thd->db)) { thd->set_time((time_t)when); thd->query_length= q_len_arg; |