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
a28ea028
Commit
a28ea028
authored
Oct 15, 2020
by
Monty
Committed by
Sergei Golubchik
May 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indentation cleanups (break long lines)
parent
f671a9de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
sql/log.cc
sql/log.cc
+9
-5
sql/mysqld.cc
sql/mysqld.cc
+1
-1
No files found.
sql/log.cc
View file @
a28ea028
...
@@ -3058,7 +3058,8 @@ void MYSQL_QUERY_LOG::reopen_file()
...
@@ -3058,7 +3058,8 @@ void MYSQL_QUERY_LOG::reopen_file()
TRUE - error occurred
TRUE - error occurred
*/
*/
bool
MYSQL_QUERY_LOG
::
write
(
time_t
event_time
,
const
char
*
user_host
,
size_t
user_host_len
,
my_thread_id
thread_id_arg
,
bool
MYSQL_QUERY_LOG
::
write
(
time_t
event_time
,
const
char
*
user_host
,
size_t
user_host_len
,
my_thread_id
thread_id_arg
,
const
char
*
command_type
,
size_t
command_type_len
,
const
char
*
command_type
,
size_t
command_type_len
,
const
char
*
sql_text
,
size_t
sql_text_len
)
const
char
*
sql_text
,
size_t
sql_text_len
)
{
{
...
@@ -3159,7 +3160,8 @@ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host, size_t use
...
@@ -3159,7 +3160,8 @@ bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host, size_t use
*/
*/
bool
MYSQL_QUERY_LOG
::
write
(
THD
*
thd
,
time_t
current_time
,
bool
MYSQL_QUERY_LOG
::
write
(
THD
*
thd
,
time_t
current_time
,
const
char
*
user_host
,
size_t
user_host_len
,
ulonglong
query_utime
,
const
char
*
user_host
,
size_t
user_host_len
,
ulonglong
query_utime
,
ulonglong
lock_utime
,
bool
is_command
,
ulonglong
lock_utime
,
bool
is_command
,
const
char
*
sql_text
,
size_t
sql_text_len
)
const
char
*
sql_text
,
size_t
sql_text_len
)
{
{
...
@@ -3198,7 +3200,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
...
@@ -3198,7 +3200,7 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
my_b_write
(
&
log_file
,
(
uchar
*
)
user_host
,
user_host_len
)
||
my_b_write
(
&
log_file
,
(
uchar
*
)
user_host
,
user_host_len
)
||
my_b_write
(
&
log_file
,
(
uchar
*
)
"
\n
"
,
1
))
my_b_write
(
&
log_file
,
(
uchar
*
)
"
\n
"
,
1
))
goto
err
;
goto
err
;
/* For slow query log */
/* For slow query log */
sprintf
(
query_time_buff
,
"%.6f"
,
ulonglong2double
(
query_utime
)
/
1000000.0
);
sprintf
(
query_time_buff
,
"%.6f"
,
ulonglong2double
(
query_utime
)
/
1000000.0
);
sprintf
(
lock_time_buff
,
"%.6f"
,
ulonglong2double
(
lock_utime
)
/
1000000.0
);
sprintf
(
lock_time_buff
,
"%.6f"
,
ulonglong2double
(
lock_utime
)
/
1000000.0
);
...
@@ -7537,7 +7539,8 @@ bool MYSQL_BIN_LOG::write_incident(THD *thd)
...
@@ -7537,7 +7539,8 @@ bool MYSQL_BIN_LOG::write_incident(THD *thd)
}
}
void
void
MYSQL_BIN_LOG
::
write_binlog_checkpoint_event_already_locked
(
const
char
*
name_arg
,
uint
len
)
MYSQL_BIN_LOG
::
write_binlog_checkpoint_event_already_locked
(
const
char
*
name_arg
,
uint
len
)
{
{
my_off_t
offset
;
my_off_t
offset
;
Binlog_checkpoint_log_event
ev
(
name_arg
,
len
);
Binlog_checkpoint_log_event
ev
(
name_arg
,
len
);
...
@@ -10471,7 +10474,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
...
@@ -10471,7 +10474,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
#endif
#endif
if
(
!
fdle
->
is_valid
()
||
if
(
!
fdle
->
is_valid
()
||
(
do_xa
&&
my_hash_init
(
key_memory_binlog_recover_exec
,
&
xids
,
&
my_charset_bin
,
TC_LOG_PAGE_SIZE
/
3
,
0
,
(
do_xa
&&
my_hash_init
(
key_memory_binlog_recover_exec
,
&
xids
,
&
my_charset_bin
,
TC_LOG_PAGE_SIZE
/
3
,
0
,
sizeof
(
my_xid
),
0
,
0
,
MYF
(
0
))))
sizeof
(
my_xid
),
0
,
0
,
MYF
(
0
))))
goto
err1
;
goto
err1
;
...
...
sql/mysqld.cc
View file @
a28ea028
...
@@ -5194,7 +5194,7 @@ static int init_server_components()
...
@@ -5194,7 +5194,7 @@ static int init_server_components()
if
(
log_output_options
&
LOG_NONE
)
if
(
log_output_options
&
LOG_NONE
)
{
{
/*
/*
Issue a war
i
ning if there were specified additional options to the
Issue a warning if there were specified additional options to the
log-output along with NONE. Probably this wasn't what user wanted.
log-output along with NONE. Probably this wasn't what user wanted.
*/
*/
if
((
log_output_options
&
LOG_NONE
)
&&
(
log_output_options
&
~
LOG_NONE
))
if
((
log_output_options
&
LOG_NONE
)
&&
(
log_output_options
&
~
LOG_NONE
))
...
...
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