diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-22 10:32:33 +0100 |
| commit | 7697bf0bd7e5b50c1071742ac90539be71f6eabe (patch) | |
| tree | 9c4f650d6961467da0bbda23e3697571c984832d /sql/rpl_gtid.cc | |
| parent | 0686c34d22a5cbf93015012eaf77a4a977b63afb (diff) | |
| parent | 080da551ea171f8a43633ab27b56875938643dd0 (diff) | |
| download | mariadb-git-7697bf0bd7e5b50c1071742ac90539be71f6eabe.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Note: some tests fail, just as they failed before the merge!
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 90d750c38ad..47c0f4e3fb7 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -562,6 +562,14 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id, if ((err= gtid_check_rpl_slave_state_table(table))) goto end; +#ifdef WITH_WSREP + /* + Updates in slave state table should not be appended to galera transaction + writeset. + */ + thd->wsrep_skip_append_keys= true; +#endif + if (!in_transaction) { DBUG_PRINT("info", ("resetting OPTION_BEGIN")); @@ -676,6 +684,10 @@ IF_DBUG(dbug_break:, ) end: +#ifdef WITH_WSREP + thd->wsrep_skip_append_keys= false; +#endif + if (table_opened) { if (err || (err= ha_commit_trans(thd, FALSE))) |