summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-05-02 17:55:00 +0200
committerSergei Golubchik <serg@mariadb.org>2018-05-12 10:16:45 +0200
commit4203f572aeebb55ad97c9576d58c0a14ed73862a (patch)
tree50771d8f00bc1264024c6b30626f7d09c52a4d0f /mysql-test/main/mysqld--help.result
parentbbf5cf4ddf1b5fe6f5c8604ce57502b9e12a7088 (diff)
downloadmariadb-git-4203f572aeebb55ad97c9576d58c0a14ed73862a.tar.gz
MDEV-15923 option to control who can set session @@timestamp
--secure-timestamp=NO|SUPER|REPLICATION|YES
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
-rw-r--r--mysql-test/main/mysqld--help.result9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 9da52106f91..0f944f238f8 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -1038,6 +1038,14 @@ The following specify which files/extra groups are read (specified before remain
--secure-file-priv=name
Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
files within specified directory
+ --secure-timestamp=name
+ Restricts direct setting of a session timestamp. Possible
+ levels are: YES - timestamp cannot deviate from the
+ system clock, REPLICATION - replication thread can adjust
+ timestamp to match the master's, SUPER - a user with this
+ privilege and a replication thread can adjust timestamp,
+ NO - historical behavior, anyone can modify session
+ timestamp
--server-id=# Uniquely identifies the server instance in the community
of replication partners
--session-track-schema
@@ -1616,6 +1624,7 @@ rpl-semi-sync-slave-trace-level 32
safe-user-create FALSE
secure-auth TRUE
secure-file-priv (No default value)
+secure-timestamp NO
server-id 1
session-track-schema TRUE
session-track-state-change FALSE