diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 14:51:25 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 14:51:25 +0200 |
| commit | c41e4d3b49d27475a907d225fe326e38cb65f1b0 (patch) | |
| tree | ee36a19bc59a217b8d18b0265f8ad88fb9f49e1f /sql/rpl_parallel.h | |
| parent | 323a7e93ee2445e6d5918b4946cbec99b1ab650c (diff) | |
| parent | 880f2273fdc39cd1a2ab28f448cdfbf3d6581af2 (diff) | |
| download | mariadb-git-c41e4d3b49d27475a907d225fe326e38cb65f1b0.tar.gz | |
Merge MDEV-7847 and MDEV-7882 into 10.0.
Conflicts:
mysql-test/suite/rpl/r/rpl_parallel.result
mysql-test/suite/rpl/t/rpl_parallel.test
Diffstat (limited to 'sql/rpl_parallel.h')
| -rw-r--r-- | sql/rpl_parallel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_parallel.h b/sql/rpl_parallel.h index 00421d6f5c9..09e0f39c0cd 100644 --- a/sql/rpl_parallel.h +++ b/sql/rpl_parallel.h @@ -53,7 +53,7 @@ struct group_commit_orderer { group_commit_orderer *prev_gco; group_commit_orderer *next_gco; /* - The sub_id of last event group in this the previous GCO. + The sub_id of last event group in the previous GCO. Only valid if prev_gco != NULL. */ uint64 prior_sub_id; |