diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
| commit | 7320a95808197d1e843c0241e5d845bd98a8097d (patch) | |
| tree | 4c53541bd85faea4f3fca21d63e1f8880d3c9189 /client | |
| parent | 0b18b79846916e1eb461f1e91fc95e2dbec60c7a (diff) | |
| parent | d53e3625cd9000b8c542fa568a6255cb22592ac5 (diff) | |
| download | mariadb-git-7320a95808197d1e843c0241e5d845bd98a8097d.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 537567cbe4e..9546e1d5944 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -736,9 +736,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, switch (ev_type) { case QUERY_EVENT: - if (strncmp(((Query_log_event*)ev)->query, "BEGIN", 5) && - strncmp(((Query_log_event*)ev)->query, "COMMIT", 6) && - strncmp(((Query_log_event*)ev)->query, "ROLLBACK", 8) && + if (!((Query_log_event*)ev)->is_trans_keyword() && shall_skip_database(((Query_log_event*)ev)->db)) goto end; if (opt_base64_output_mode == BASE64_OUTPUT_ALWAYS) |