summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorhalfspawn <j.brauge@qualiac.com>2017-10-13 15:55:42 +0200
committerAlexander Barkov <bar@mariadb.org>2017-10-14 17:28:54 +0400
commit75aabd03d57f85d63d57b25a239b4f930a3ae3c0 (patch)
tree27b8202dabd463670aa819c36d82b0bfa3da18ca /mysql-test/r/mysqld--help.result
parent081f5aa8262cfa425f3d5e2c242f3888ded98ee2 (diff)
downloadmariadb-git-75aabd03d57f85d63d57b25a239b4f930a3ae3c0.tar.gz
MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULL
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 1137466dd8b..b1d6996465d 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1084,7 +1084,8 @@ The following options may be given as the first argument:
NO_ZERO_DATE, ALLOW_INVALID_DATES,
ERROR_FOR_DIVISION_BY_ZERO, TRADITIONAL,
NO_AUTO_CREATE_USER, HIGH_NOT_PRECEDENCE,
- NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
+ NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH,
+ EMPTY_STRING_IS_NULL
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
--standard-compliant-cte