diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-13 20:27:46 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-13 20:27:46 +0200 |
commit | 68e5d6a9416b2923e78123cbc67e1755b8a21806 (patch) | |
tree | 857baf4a5174703c4abf1722617a38a0556f2682 /sql | |
parent | bec27127753e9ee8cf58132b531dba1af534d91a (diff) | |
download | mariadb-git-68e5d6a9416b2923e78123cbc67e1755b8a21806.tar.gz |
Do not truncate integers on 32-bit systems in Rows_event_tracker
commit 3dc3ab1a3048484910ca8acccaf76c71b080e533 introduced
Rows_event_tracker, using a mismatch of size_t (the native
register width) and my_off_t (the file offset width, usually
64 bits). Use my_off_t both in member fields and member functions.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/rpl_mi.h | 4 | ||||
-rw-r--r-- | sql/slave.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index b304e45f86a..b81c1fb398a 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -139,11 +139,11 @@ typedef struct st_rows_event_tracker my_off_t first_seen; my_off_t last_seen; bool stmt_end_seen; - void update(const char* file_name, size_t pos, + void update(const char* file_name, my_off_t pos, const char* buf, const Format_description_log_event *fdle); void reset(); - bool check_and_report(const char* file_name, size_t pos); + bool check_and_report(const char* file_name, my_off_t pos); } Rows_event_tracker; /***************************************************************************** diff --git a/sql/slave.cc b/sql/slave.cc index e5c502c2de5..d124b15e47c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7650,7 +7650,7 @@ void Rows_event_tracker::reset() well as the end-of-statement status of the last one. */ -void Rows_event_tracker::update(const char* file_name, size_t pos, +void Rows_event_tracker::update(const char* file_name, my_off_t pos, const char* buf, const Format_description_log_event *fdle) { @@ -7675,7 +7675,7 @@ void Rows_event_tracker::update(const char* file_name, size_t pos, false otherwise. */ bool Rows_event_tracker::check_and_report(const char* file_name, - size_t pos) + my_off_t pos) { if (last_seen) { |