diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 13:21:58 +0200 |
| commit | 791b0ab5db47528d93cdaf534114e417ff06b66a (patch) | |
| tree | b47e7bc501a73ce95328dddced35b891d5ac21ba /sql/rpl_rli.cc | |
| parent | c6d08ecce3e7c18ecaae973c67bd2e547e0db4dd (diff) | |
| parent | 519ad0f7e35ff4dd13aac3c13da44c649f724352 (diff) | |
| download | mariadb-git-791b0ab5db47528d93cdaf534114e417ff06b66a.tar.gz | |
Merge 10.0 -> 10.1
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 58aa1e4023d..2c98cc681f5 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1769,7 +1769,7 @@ void rpl_group_info::cleanup_context(THD *thd, bool error) trans_rollback(thd); // if a "real transaction" /* Now that we have rolled back the transaction, make sure we do not - errorneously update the GTID position. + erroneously update the GTID position. */ gtid_pending= false; } |