database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

after-merge fixes

Browse Source
This commit is contained in:
Kristian Nielsen
2015-03-04 14:06:44 +01:00
parent 95d7208859
commit 2e4dc5a370
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/rpl_gtid.cc
View File

@ -1178,7 +1178,7 @@ rpl_binlog_state::load(rpl_slave_state *slave_pos)
mysql_mutex_lock(&LOCK_binlog_state); mysql_mutex_lock(&LOCK_binlog_state);
reset_nolock(); reset_nolock();
if (slave_pos->iterate(rpl_binlog_state_load_cb, this, NULL, 0)) if (slave_pos->iterate(rpl_binlog_state_load_cb, this, NULL, 0, false))
res= true; res= true;
mysql_mutex_unlock(&LOCK_binlog_state); mysql_mutex_unlock(&LOCK_binlog_state);
return res; return res;

1
sql/rpl_rli.cc
View File

@ -1421,7 +1421,6 @@ void
Relay_log_info::free_inuse_relaylog(inuse_relaylog *ir) Relay_log_info::free_inuse_relaylog(inuse_relaylog *ir)
{ {
my_free(ir->relay_log_state); my_free(ir->relay_log_state);
my_atomic_rwlock_destroy(&ir->inuse_relaylog_atomic_lock);
my_free(ir); my_free(ir);
} }

2
sql/slave.cc
View File

@ -4722,7 +4722,7 @@ log '%s' at position %s, relay log '%s' position: %s%s", RPL_LOG_NAME,
ulong domain_count; ulong domain_count;
flush_relay_log_info(rli); flush_relay_log_info(rli);
if (opt_slave_parallel_threads > 0) if (mi->using_parallel())
{ {
/* /*
In parallel replication GTID mode, we may stop with different domains In parallel replication GTID mode, we may stop with different domains

6
sql/sql_repl.cc
View File

@ -2335,12 +2335,12 @@ static int send_format_descriptor_event(binlog_send_info *info,
slave connects at a position past this event, it means that it slave connects at a position past this event, it means that it
already received and handled it in a previous connect). already received and handled it in a previous connect).
*/ */
if (!info.gtid_state.is_pos_reached()) if (!info->gtid_state.is_pos_reached())
{ {
int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+ int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+
ST_CREATED_OFFSET+ev_offset, (ulong) 0); ST_CREATED_OFFSET+ev_offset, (ulong) 0);
if (info.current_checksum_alg != BINLOG_CHECKSUM_ALG_OFF && if (info->current_checksum_alg != BINLOG_CHECKSUM_ALG_OFF &&
info.current_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF) info->current_checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF)
fix_checksum(packet, ev_offset); fix_checksum(packet, ev_offset);
} }
} }