diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
| commit | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (patch) | |
| tree | 49738ad2561489954fa0973d82be10fafbf42e0b /sql/log.h | |
| parent | afbb72b3b6988f4c5242d46588754517724b2950 (diff) | |
| parent | aed2050e40cb332d54e8d40eb7242309b962c4e1 (diff) | |
| download | mariadb-git-fbab79c9b8a58b90292e900cf46ab6d6632ebb68.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index e2abcea9fdf..a5548ef4e60 100644 --- a/sql/log.h +++ b/sql/log.h @@ -562,7 +562,13 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG bool write_transaction_to_binlog_events(group_commit_entry *entry); void trx_group_commit_leader(group_commit_entry *leader); bool is_xidlist_idle_nolock(); - +#ifdef WITH_WSREP + /* + When this mariadb node is slave and galera enabled. So in this case + we write the gtid in wsrep_run_commit itself. + */ + inline bool is_gtid_cached(THD *thd); +#endif public: /* A list of struct xid_count_per_binlog is used to keep track of how many @@ -582,6 +588,7 @@ public: ulong binlog_id; /* Total prepared XIDs and pending checkpoint requests in this binlog. */ long xid_count; + long notify_count; /* For linking in requests to the binlog background thread. */ xid_count_per_binlog *next_in_queue; xid_count_per_binlog(); /* Give link error if constructor used. */ |