diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 15:10:29 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-30 15:10:29 +0200 |
| commit | f573b65e4173a90a738682837e2f0020c76827ff (patch) | |
| tree | 913635826e68306e4804fa73ee17b301ac0f01e0 /sql/rpl_parallel.h | |
| parent | 59df1009222a73fbd184987d1c8700f86b30792b (diff) | |
| parent | 880f2273fdc39cd1a2ab28f448cdfbf3d6581af2 (diff) | |
| download | mariadb-git-f573b65e4173a90a738682837e2f0020c76827ff.tar.gz | |
Merge MDEV-7847 and MDEV-7882 into 10.0.
Conflicts:
mysql-test/suite/rpl/r/rpl_parallel.result
sql/rpl_parallel.cc
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 93139971ca6..cddc8e5dd07 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; |