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
97dbb356
Commit
97dbb356
authored
6 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify usage of logger.set_handlers()
parent
a4ac987c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
15 deletions
+8
-15
sql/mysqld.cc
sql/mysqld.cc
+8
-15
No files found.
sql/mysqld.cc
View file @
97dbb356
...
...
@@ -3458,21 +3458,14 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
REFRESH_GRANT
|
REFRESH_THREADS
|
REFRESH_HOSTS
),
(
TABLE_LIST
*
)
0
,
&
not_used
);
// Flush logs
}
/* reenable logs after the options were reloaded */
if
(
log_output_options
&
LOG_NONE
)
{
logger
.
set_handlers
(
LOG_FILE
,
global_system_variables
.
sql_log_slow
?
LOG_TABLE
:
LOG_NONE
,
opt_log
?
LOG_TABLE
:
LOG_NONE
);
}
else
{
logger
.
set_handlers
(
LOG_FILE
,
global_system_variables
.
sql_log_slow
?
log_output_options
:
LOG_NONE
,
opt_log
?
log_output_options
:
LOG_NONE
);
/* reenable logs after the options were reloaded */
ulonglong
fixed_log_output_options
=
log_output_options
&
LOG_NONE
?
LOG_TABLE
:
log_output_options
;
logger
.
set_handlers
(
LOG_FILE
,
global_system_variables
.
sql_log_slow
?
fixed_log_output_options
:
LOG_NONE
,
opt_log
?
fixed_log_output_options
:
LOG_NONE
);
}
break
;
#ifdef USE_ONE_SIGNAL_HAND
...
...
This diff is collapsed.
Click to expand it.
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