summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result28
1 files changed, 22 insertions, 6 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 2baf4f6c314..9f748953521 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -258,6 +258,13 @@ The following options may be given as the first argument:
applied; this means it is the responsibility of the user
to ensure that GTID sequence numbers are strictly
increasing.
+ --gtid-pos-auto-engines=name
+ List of engines for which to automatically create a
+ mysql.gtid_slave_pos_ENGINE table, if a transaction using
+ that engine is replicated. This can be used to avoid
+ introducing cross-engine transactions, if engines are
+ used different from that used by table
+ mysql.gtid_slave_pos
--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
@@ -272,6 +279,15 @@ The following options may be given as the first argument:
height-balanced.
--host-cache-size=# How many host names should be cached to avoid resolving.
(Automatically configured unless set explicitly)
+ --idle-readonly-transaction-timeout=#
+ The number of seconds the server waits for read-only idle
+ transaction
+ --idle-readwrite-transaction-timeout=#
+ The number of seconds the server waits for read-write
+ idle transaction
+ --idle-transaction-timeout=#
+ The number of seconds the server waits for idle
+ transaction
--ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin
--ignore-db-dirs=name
@@ -929,11 +945,7 @@ The following options may be given as the first argument:
--session-track-state-change
Track changes to the session state.
--session-track-system-variables=name
- Track changes in registered system variables. For
- compatibility with MySQL defaults this variable should be
- set to "autocommit, character_set_client,
- character_set_connection, character_set_results,
- time_zone"
+ Track changes in registered system variables.
--session-track-transaction-info=name
Track changes to the transaction attributes. OFF to
disable; STATE to track just transaction state (Is there
@@ -1263,11 +1275,15 @@ getopt-prefix-matching FALSE
group-concat-max-len 1048576
gtid-domain-id 0
gtid-ignore-duplicates FALSE
+gtid-pos-auto-engines
gtid-strict-mode FALSE
help TRUE
histogram-size 0
histogram-type SINGLE_PREC_HB
host-cache-size 279
+idle-readonly-transaction-timeout 0
+idle-readwrite-transaction-timeout 0
+idle-transaction-timeout 0
ignore-builtin-innodb FALSE
ignore-db-dirs
init-connect
@@ -1454,7 +1470,7 @@ secure-file-priv (No default value)
server-id 1
session-track-schema TRUE
session-track-state-change FALSE
-session-track-system-variables
+session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone
session-track-transaction-info OFF
show-slave-auth-info FALSE
silent-startup FALSE