Commit 2750a020 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge bb-10.2-ext into 10.3

parents 70fff368 68e5d6a9
...@@ -139,11 +139,11 @@ typedef struct st_rows_event_tracker ...@@ -139,11 +139,11 @@ typedef struct st_rows_event_tracker
my_off_t first_seen; my_off_t first_seen;
my_off_t last_seen; my_off_t last_seen;
bool stmt_end_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 char* buf,
const Format_description_log_event *fdle); const Format_description_log_event *fdle);
void reset(); 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; } Rows_event_tracker;
/***************************************************************************** /*****************************************************************************
......
...@@ -7976,7 +7976,7 @@ void Rows_event_tracker::reset() ...@@ -7976,7 +7976,7 @@ void Rows_event_tracker::reset()
well as the end-of-statement status of the last one. 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 char* buf,
const Format_description_log_event *fdle) const Format_description_log_event *fdle)
{ {
...@@ -8001,7 +8001,7 @@ void Rows_event_tracker::update(const char* file_name, size_t pos, ...@@ -8001,7 +8001,7 @@ void Rows_event_tracker::update(const char* file_name, size_t pos,
false otherwise. false otherwise.
*/ */
bool Rows_event_tracker::check_and_report(const char* file_name, bool Rows_event_tracker::check_and_report(const char* file_name,
size_t pos) my_off_t pos)
{ {
if (last_seen) if (last_seen)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment