summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2014-03-04 14:32:42 +0100
committerunknown <knielsen@knielsen-hq.org>2014-03-04 14:32:42 +0100
commit5ec49e6452d4c76650c8475e387283fdbe480672 (patch)
treeb2ee21e1c2b89e9050ea65ac70fc3792f9df7a69 /sql/log_event.h
parent016bd4fc5fff311dc4091b3b7329cd980dbaa14b (diff)
parentb5b82108497b5beda3b2fbe98ecea178b5e58076 (diff)
downloadmariadb-git-5ec49e6452d4c76650c8475e387283fdbe480672.tar.gz
Merge MDEV-5754, MDEV-5769, and MDEV-5764 into 10.0
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index cfdc65a2c40..a9d1b08171f 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -3123,12 +3123,15 @@ public:
<td>flags</td>
<td>1 byte bitfield</td>
<td>Bit 0 set indicates stand-alone event (no terminating COMMIT)</td>
+ <td>Bit 1 set indicates group commit, and that commit id exists</td>
</tr>
<tr>
- <td>Reserved</td>
- <td>6 bytes</td>
- <td>Reserved bytes, set to 0. Maybe be used for future expansion.</td>
+ <td>Reserved (no group commit) / commit id (group commit) (see flags bit 1)</td>
+ <td>6 bytes / 8 bytes</td>
+ <td>Reserved bytes, set to 0. Maybe be used for future expansion (no
+ group commit). OR commit id, same for all GTIDs in the same group
+ commit (see flags bit 1).</td>
</tr>
</table>