diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
| commit | e47ab5a604954b0019ea9fe90cdb91023e55be07 (patch) | |
| tree | 703aceeb455a79b6ec6291bdc71ff13ffa24a2c0 /sql/sql_class.cc | |
| parent | ad43230e3bd5a419709a2559478be5cfb2cae3d2 (diff) | |
| parent | 455f754e6ba4de3d3b527aad6ac317b7e5994b86 (diff) | |
| download | mariadb-git-e47ab5a604954b0019ea9fe90cdb91023e55be07.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/sql_class.cc
Text conflict in sql/sql_load.cc
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1b5fdd509f9..5859b6e5fd7 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4468,7 +4468,6 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end, bool is_transactional) if (stmt_end) { pending->set_flags(Rows_log_event::STMT_END_F); - pending->flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F; binlog_table_maps= 0; } @@ -4654,7 +4653,6 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query_arg, { Query_log_event qinfo(this, query_arg, query_len, is_trans, direct, suppress_use, errcode); - qinfo.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F; /* Binlog table maps will be irrelevant after a Query_log_event (they are just removed on the slave side) so after the query |