diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-11-13 14:24:40 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-11-13 14:24:40 +0100 |
| commit | 8f2e05f41cf3b92bdb4c409e542ef126d5fe8f95 (patch) | |
| tree | 701b5599a3c9478e125535580e294f8b627f2834 /sql/rpl_rli.h | |
| parent | 2828c2be554b62646fc990ac28b4aef20cd9b9d2 (diff) | |
| parent | ba02550166eb39c0375a6422ecaa4731421250b6 (diff) | |
| download | mariadb-git-8f2e05f41cf3b92bdb4c409e542ef126d5fe8f95.tar.gz | |
Merge branch 'mdev7818-4' into 10.1
Conflicts:
mysql-test/suite/perfschema/r/stage_mdl_global.result
sql/rpl_rli.cc
sql/sql_parse.cc
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 377db469276..23ab1664a7b 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -669,6 +669,13 @@ struct rpl_group_info char gtid_info_buf[5+10+1+10+1+20+1]; /* + The timestamp, from the master, of the commit event. + Used to do delayed update of rli->last_master_timestamp, for getting + reasonable values out of Seconds_Behind_Master in SHOW SLAVE STATUS. + */ + time_t last_master_timestamp; + + /* Information to be able to re-try an event group in case of a deadlock or other temporary error. */ |