diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-10-15 12:59:04 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-10-15 12:59:04 +0200 |
| commit | 28ad5abade79d4cc3248aee621f99ae293a19211 (patch) | |
| tree | a899cb640056e6997d0937f5b99f245b6552c698 | |
| parent | acf8fc1ff8a7b2d49e25279670b04b8eb096ce0c (diff) | |
| parent | dc3a20b191362227a6f85fadfc3a8b6c76f69ec6 (diff) | |
| download | mariadb-git-28ad5abade79d4cc3248aee621f99ae293a19211.tar.gz | |
Merge branch 'bb-5.5-wlad' into 5.5
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 2 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.h | 1 |
3 files changed, 3 insertions, 2 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 diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ffe861ddfbc..080e74ce367 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2719,7 +2719,7 @@ static Sys_var_bit Sys_auto_is_null( static Sys_var_bit Sys_safe_updates( "sql_safe_updates", "sql_safe_updates", - SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_SAFE_UPDATES, + SESSION_VAR(option_bits), CMD_LINE(REQUIRED_ARG), OPTION_SAFE_UPDATES, DEFAULT(FALSE)); static Sys_var_bit Sys_buffer_results( diff --git a/sql/sys_vars.h b/sql/sys_vars.h index dbe27ab107e..c21bf8244f0 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -1443,7 +1443,6 @@ public: bitmask= reverse_semantics ? ~bitmask_arg : bitmask_arg; set(global_var_ptr(), def_val); SYSVAR_ASSERT(def_val < 2); - SYSVAR_ASSERT(getopt.id == -1); // force NO_CMD_LINE SYSVAR_ASSERT(size == sizeof(ulonglong)); } bool session_update(THD *thd, set_var *var) |