diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-02-26 22:27:20 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-02-26 22:27:20 -0700 |
commit | 9e459e16d259d4cae5446dcad2e4e7cc5314da34 (patch) | |
tree | 9e107644fb651c7f8984d880198177b1d625a360 /sql/slave.h | |
parent | f80c3cb4f1fbd974859faa5033d8e5ad7f528c9e (diff) | |
download | mariadb-git-9e459e16d259d4cae5446dcad2e4e7cc5314da34.tar.gz |
ulonglong -> uint32 for log offset
more verbose messages when slave thread exits
sql/slave.cc:
ulonglong -> uint32 for log offset
sql/slave.h:
ulonglong -> uint32 for log offset
Diffstat (limited to 'sql/slave.h')
-rw-r--r-- | sql/slave.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/slave.h b/sql/slave.h index 11c01a9fa03..d47ec22410c 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -4,7 +4,7 @@ typedef struct st_master_info { char log_file_name[FN_REFLEN]; - ulonglong pos,pending; + uint32 pos,pending; File fd; // we keep the file open, so we need to remember the file pointer IO_CACHE file; // the variables below are needed because we can change masters on the fly @@ -29,11 +29,11 @@ typedef struct st_master_info pthread_mutex_destroy(&lock); pthread_cond_destroy(&cond); } - inline void inc_pending(ulonglong val) + inline void inc_pending(uint32 val) { pending += val; } - inline void inc_pos(ulonglong val) + inline void inc_pos(uint32 val) { pthread_mutex_lock(&lock); pos += val + pending; @@ -43,7 +43,7 @@ typedef struct st_master_info } // thread safe read of position - not needed if we are in the slave thread, // but required otherwise - inline void read_pos(ulonglong& var) + inline void read_pos(uint32& var) { pthread_mutex_lock(&lock); var = pos; |