database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-26: Global transaction ID.

Browse Source 
Fix missing error check for applying Gtid_log_event.

Fix a couple compiler warnings.
This commit is contained in:
unknown
2013-03-26 14:58:14 +01:00
parent 5fa4c23519
commit f66e3474a8
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log_event.cc
View File

@@ -6235,12 +6235,15 @@ Gtid_log_event::do_apply_event(Relay_log_info const *rli)
/* Finalize server status flags after executing a statement. */ /* Finalize server status flags after executing a statement. */
thd->update_server_status(); thd->update_server_status();
log_slow_statement(thd); log_slow_statement(thd);
general_log_write(thd, COM_QUERY, thd->query(), thd->query_length()); if (unlikely(thd->is_fatal_error))
thd->is_slave_error= 1;
else if (likely(!thd->is_slave_error))
general_log_write(thd, COM_QUERY, thd->query(), thd->query_length());
} }
thd->reset_query(); thd->reset_query();
free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC)); free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
return 0; return thd->is_slave_error;
} }

5
sql/rpl_gtid.cc
View File

@@ -1088,16 +1088,17 @@ slave_connection_state::update(const rpl_gtid *in_gtid)
void void
slave_connection_state::remove(const rpl_gtid *in_gtid) slave_connection_state::remove(const rpl_gtid *in_gtid)
{ {
bool err;
uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0); uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0);
#ifndef DBUG_OFF #ifndef DBUG_OFF
bool err;
rpl_gtid *slave_gtid= (rpl_gtid *)rec; rpl_gtid *slave_gtid= (rpl_gtid *)rec;
DBUG_ASSERT(rec /* We should never try to remove not present domain_id. */); DBUG_ASSERT(rec /* We should never try to remove not present domain_id. */);
DBUG_ASSERT(slave_gtid->server_id == in_gtid->server_id); DBUG_ASSERT(slave_gtid->server_id == in_gtid->server_id);
DBUG_ASSERT(slave_gtid->seq_no == in_gtid->seq_no); DBUG_ASSERT(slave_gtid->seq_no == in_gtid->seq_no);
#endif #endif
err= my_hash_delete(&hash, rec); IF_DBUG(err=, )
my_hash_delete(&hash, rec);
DBUG_ASSERT(!err); DBUG_ASSERT(!err);
} }

1
sql/sql_repl.cc
View File

@@ -1400,6 +1400,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
DBUG_PRINT("enter",("log_ident: '%s' pos: %ld", log_ident, (long) pos)); DBUG_PRINT("enter",("log_ident: '%s' pos: %ld", log_ident, (long) pos));
bzero((char*) &log,sizeof(log)); bzero((char*) &log,sizeof(log));
bzero(&error_gtid, sizeof(error_gtid));
/* /*
heartbeat_period from @master_heartbeat_period user variable heartbeat_period from @master_heartbeat_period user variable
*/ */