diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
| commit | 742e1c727fc2be50b758068c2ab92abb19f3ff56 (patch) | |
| tree | b4efffa4eade915001faf0ceaf50715306416907 /mysql-test/main/mysqld--help.result | |
| parent | 19283c67c6d196a49211da6f925ca59fceef3ea0 (diff) | |
| parent | 30914389fe9ca13cf29470dd033a5cf6997a3931 (diff) | |
| download | mariadb-git-742e1c727fc2be50b758068c2ab92abb19f3ff56.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index a8aa461c863..a9d5d14c629 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -360,7 +360,9 @@ The following specify which files/extra groups are read (specified before remain --gtid-strict-mode Enforce strict seq_no ordering of events in the binary log. Slave stops with an error if it encounters an event that would cause it to generate an out-of-order binlog if - executed. + executed. When ON the same server-id semisync-replicated + transactions that duplicate exising ones in binlog are + ignored without error and slave interruption. -?, --help Display this help and exit. --histogram-size=# Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. |