diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:37:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:37:45 +0100 |
| commit | 6ae5f0efea392e3fdb285afc1bafdae16888b96a (patch) | |
| tree | 7f1ba67abdfa80840675a8a08cfb64009bb7a507 /sql/sql_class.cc | |
| parent | 5290811c5c2f8e97dbef21bd32e7b1d5bb43022a (diff) | |
| download | mariadb-git-6ae5f0efea392e3fdb285afc1bafdae16888b96a.tar.gz | |
MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work
Patially merge WL#5917, to understand v2 row events
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 25f07ea9574..94bd1b761af 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -5392,7 +5392,7 @@ THD::binlog_prepare_pending_rows_event(TABLE* table, uint32 serv_id, DBUG_ASSERT(table->s->table_map_id != ~0UL); /* Fetch the type code for the RowsEventT template parameter */ - int const type_code= RowsEventT::TYPE_CODE; + int const general_type_code= RowsEventT::TYPE_CODE; /* There is no good place to set up the transactional data, so we @@ -5419,7 +5419,7 @@ THD::binlog_prepare_pending_rows_event(TABLE* table, uint32 serv_id, if (!pending || pending->server_id != serv_id || pending->get_table_id() != table->s->table_map_id || - pending->get_type_code() != type_code || + pending->get_general_type_code() != general_type_code || pending->get_data_size() + needed > opt_binlog_rows_event_max_size || pending->get_width() != colcnt || !bitmap_cmp(pending->get_cols(), cols)) |