summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-10-15 12:06:00 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2018-10-15 12:06:00 +0200
commitdc3a20b191362227a6f85fadfc3a8b6c76f69ec6 (patch)
tree65dd8f104853aa5f7ec192400f59596f404c2bdc /mysql-test/r/mysqld--help.result
parent9905949b414740cdb15d5048b3289e4c5bb54f93 (diff)
downloadmariadb-git-dc3a20b191362227a6f85fadfc3a8b6c76f69ec6.tar.gz
MDEV-14429 sql_safe_updates in my.cnf not work
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 825c7e786a3..0d8728a6768 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -790,6 +790,7 @@ The following specify which files/extra groups are read (specified before remain
this size
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
for the complete list of valid sql modes
+ --sql-safe-updates sql_safe_updates
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
--stored-program-cache=#
@@ -1081,6 +1082,7 @@ slow-launch-time 2
slow-query-log FALSE
sort-buffer-size 2097152
sql-mode
+sql-safe-updates FALSE
stack-trace TRUE
stored-program-cache 256
symbolic-links FALSE