diff --git a/server/modules/routing/binlogrouter/blr.h b/server/modules/routing/binlogrouter/blr.h index f80794723..641861463 100644 --- a/server/modules/routing/binlogrouter/blr.h +++ b/server/modules/routing/binlogrouter/blr.h @@ -34,7 +34,6 @@ #include #include #include -#include #include MXS_BEGIN_DECLS @@ -535,7 +534,7 @@ typedef struct router_slave /*< lsi: Last Sent Information */ blr_thread_role_t lsi_sender_role; /*< Master or slave code sent */ - THREAD lsi_sender_tid; + uint64_t lsi_sender_tid; /*< Who sent */ char lsi_binlog_name[BINLOG_FNAMELEN + 1]; /*< Which binlog file */ diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc index d76ee5ca8..753e8e930 100644 --- a/server/modules/routing/binlogrouter/blr_master.cc +++ b/server/modules/routing/binlogrouter/blr_master.cc @@ -36,6 +36,8 @@ #include #include +#include + #include #include #include @@ -1739,7 +1741,7 @@ bool blr_send_event(blr_thread_role_t role, slave->serverid, binlog_name, binlog_pos, - (uint64_t)thread_self(), + (uint64_t)pthread_self(), ROLETOSTR(role), (uint64_t)slave->lsi_sender_tid, ROLETOSTR(slave->lsi_sender_role), @@ -1792,7 +1794,7 @@ bool blr_send_event(blr_thread_role_t role, strcpy(slave->lsi_binlog_name, binlog_name); slave->lsi_binlog_pos = binlog_pos; slave->lsi_sender_role = role; - slave->lsi_sender_tid = thread_self(); + slave->lsi_sender_tid = pthread_self(); } else {