summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-07-28 10:47:33 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-07-28 10:47:33 +0300
commitf53f64b7b9edaef8e413add322225dc33ebc8131 (patch)
tree80885434187ce270e4a3f8f43137364f73c9f060 /mysql-test/main/mysqld--help.result
parentd8c2eeeb5998a2a126eb63f1be8bbfb86c3c8693 (diff)
parentf79cebb4d02a7b5151ac617bc762c3e094436562 (diff)
downloadmariadb-git-f53f64b7b9edaef8e413add322225dc33ebc8131.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
-rw-r--r--mysql-test/main/mysqld--help.result4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 684db62d770..6959ae85865 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -363,7 +363,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.