Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
dc3a20b1
Commit
dc3a20b1
authored
Oct 15, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-14429 sql_safe_updates in my.cnf not work
parent
9905949b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
mysql-test/r/mysqld--help.result
mysql-test/r/mysqld--help.result
+2
-0
sql/sys_vars.cc
sql/sys_vars.cc
+1
-1
sql/sys_vars.h
sql/sys_vars.h
+0
-1
No files found.
mysql-test/r/mysqld--help.result
View file @
dc3a20b1
...
...
@@ -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
...
...
sql/sys_vars.cc
View file @
dc3a20b1
...
...
@@ -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
(
...
...
sql/sys_vars.h
View file @
dc3a20b1
...
...
@@ -1443,7 +1443,6 @@ class Sys_var_bit: public Sys_var_typelib
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment