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
716d396b
Commit
716d396b
authored
Oct 21, 2019
by
Michael Widenius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove \n from DBUG_PRINT statements
parent
06d2e1d8
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
9 deletions
+9
-9
sql/log.cc
sql/log.cc
+1
-1
sql/rpl_rli.cc
sql/rpl_rli.cc
+1
-1
sql/semisync_master.cc
sql/semisync_master.cc
+1
-1
sql/sql_lex.cc
sql/sql_lex.cc
+1
-1
sql/sql_lex.h
sql/sql_lex.h
+1
-1
sql/sql_load.cc
sql/sql_load.cc
+1
-1
sql/sql_prepare.cc
sql/sql_prepare.cc
+2
-2
sql/wsrep_mysqld.cc
sql/wsrep_mysqld.cc
+1
-1
No files found.
sql/log.cc
View file @
716d396b
...
@@ -7690,7 +7690,7 @@ MYSQL_BIN_LOG::queue_for_group_commit(group_commit_entry *orig_entry)
...
@@ -7690,7 +7690,7 @@ MYSQL_BIN_LOG::queue_for_group_commit(group_commit_entry *orig_entry)
mysql_mutex_unlock
(
&
LOCK_prepare_ordered
);
mysql_mutex_unlock
(
&
LOCK_prepare_ordered
);
DEBUG_SYNC
(
orig_entry
->
thd
,
"commit_after_release_LOCK_prepare_ordered"
);
DEBUG_SYNC
(
orig_entry
->
thd
,
"commit_after_release_LOCK_prepare_ordered"
);
DBUG_PRINT
(
"info"
,
(
"Queued for group commit as %s
\n
"
,
DBUG_PRINT
(
"info"
,
(
"Queued for group commit as %s"
,
(
orig_queue
==
NULL
)
?
"leader"
:
"participant"
));
(
orig_queue
==
NULL
)
?
"leader"
:
"participant"
));
DBUG_RETURN
(
orig_queue
==
NULL
);
DBUG_RETURN
(
orig_queue
==
NULL
);
}
}
...
...
sql/rpl_rli.cc
View file @
716d396b
...
@@ -1561,7 +1561,7 @@ scan_one_gtid_slave_pos_table(THD *thd, HASH *hash, DYNAMIC_ARRAY *array,
...
@@ -1561,7 +1561,7 @@ scan_one_gtid_slave_pos_table(THD *thd, HASH *hash, DYNAMIC_ARRAY *array,
sub_id
=
(
ulonglong
)
table
->
field
[
1
]
->
val_int
();
sub_id
=
(
ulonglong
)
table
->
field
[
1
]
->
val_int
();
server_id
=
(
uint32
)
table
->
field
[
2
]
->
val_int
();
server_id
=
(
uint32
)
table
->
field
[
2
]
->
val_int
();
seq_no
=
(
ulonglong
)
table
->
field
[
3
]
->
val_int
();
seq_no
=
(
ulonglong
)
table
->
field
[
3
]
->
val_int
();
DBUG_PRINT
(
"info"
,
(
"Read slave state row: %u-%u-%lu sub_id=%lu
\n
"
,
DBUG_PRINT
(
"info"
,
(
"Read slave state row: %u-%u-%lu sub_id=%lu"
,
(
unsigned
)
domain_id
,
(
unsigned
)
server_id
,
(
unsigned
)
domain_id
,
(
unsigned
)
server_id
,
(
ulong
)
seq_no
,
(
ulong
)
sub_id
));
(
ulong
)
seq_no
,
(
ulong
)
sub_id
));
...
...
sql/semisync_master.cc
View file @
716d396b
...
@@ -806,7 +806,7 @@ int Repl_semi_sync_master::commit_trx(const char* trx_wait_binlog_name,
...
@@ -806,7 +806,7 @@ int Repl_semi_sync_master::commit_trx(const char* trx_wait_binlog_name,
if
(
!
get_master_enabled
()
||
!
is_on
())
if
(
!
get_master_enabled
()
||
!
is_on
())
goto
l_end
;
goto
l_end
;
DBUG_PRINT
(
"semisync"
,
(
"%s: wait pos (%s, %lu), repl(%d)
\n
"
,
DBUG_PRINT
(
"semisync"
,
(
"%s: wait pos (%s, %lu), repl(%d)"
,
"Repl_semi_sync_master::commit_trx"
,
"Repl_semi_sync_master::commit_trx"
,
trx_wait_binlog_name
,
(
ulong
)
trx_wait_binlog_pos
,
trx_wait_binlog_name
,
(
ulong
)
trx_wait_binlog_pos
,
(
int
)
is_on
()));
(
int
)
is_on
()));
...
...
sql/sql_lex.cc
View file @
716d396b
...
@@ -7314,7 +7314,7 @@ uint binlog_unsafe_map[256];
...
@@ -7314,7 +7314,7 @@ uint binlog_unsafe_map[256];
#define UNSAFE(a, b, c) \
#define UNSAFE(a, b, c) \
{ \
{ \
DBUG_PRINT("unsafe_mixed_statement", ("SETTING BASE VALUES: %s, %s, %02X
\n
", \
DBUG_PRINT("unsafe_mixed_statement", ("SETTING BASE VALUES: %s, %s, %02X", \
LEX::stmt_accessed_table_string(a), \
LEX::stmt_accessed_table_string(a), \
LEX::stmt_accessed_table_string(b), \
LEX::stmt_accessed_table_string(b), \
c)); \
c)); \
...
...
sql/sql_lex.h
View file @
716d396b
...
@@ -2077,7 +2077,7 @@ class Query_tables_list
...
@@ -2077,7 +2077,7 @@ class Query_tables_list
unsafe
=
(
binlog_unsafe_map
[
stmt_accessed_table_flag
]
&
condition
);
unsafe
=
(
binlog_unsafe_map
[
stmt_accessed_table_flag
]
&
condition
);
#if !defined(DBUG_OFF)
#if !defined(DBUG_OFF)
DBUG_PRINT
(
"LEX::is_mixed_stmt_unsafe"
,
(
"RESULT %02X %02X %02X
\n
"
,
condition
,
DBUG_PRINT
(
"LEX::is_mixed_stmt_unsafe"
,
(
"RESULT %02X %02X %02X"
,
condition
,
binlog_unsafe_map
[
stmt_accessed_table_flag
],
binlog_unsafe_map
[
stmt_accessed_table_flag
],
(
binlog_unsafe_map
[
stmt_accessed_table_flag
]
&
condition
)));
(
binlog_unsafe_map
[
stmt_accessed_table_flag
]
&
condition
)));
...
...
sql/sql_load.cc
View file @
716d396b
...
@@ -2063,7 +2063,7 @@ int READ_INFO::read_xml(THD *thd)
...
@@ -2063,7 +2063,7 @@ int READ_INFO::read_xml(THD *thd)
chr
=
read_value
(
delim
,
&
value
);
chr
=
read_value
(
delim
,
&
value
);
if
(
attribute
.
length
()
>
0
&&
value
.
length
()
>
0
)
if
(
attribute
.
length
()
>
0
&&
value
.
length
()
>
0
)
{
{
DBUG_PRINT
(
"read_xml"
,
(
"lev:%i att:%s val:%s
\n
"
,
DBUG_PRINT
(
"read_xml"
,
(
"lev:%i att:%s val:%s"
,
level
+
1
,
level
+
1
,
attribute
.
c_ptr_safe
(),
attribute
.
c_ptr_safe
(),
value
.
c_ptr_safe
()));
value
.
c_ptr_safe
()));
...
...
sql/sql_prepare.cc
View file @
716d396b
...
@@ -3274,7 +3274,7 @@ void mysql_sql_stmt_execute(THD *thd)
...
@@ -3274,7 +3274,7 @@ void mysql_sql_stmt_execute(THD *thd)
/* Query text for binary, general or slow log, if any of them is open */
/* Query text for binary, general or slow log, if any of them is open */
String
expanded_query
;
String
expanded_query
;
DBUG_ENTER
(
"mysql_sql_stmt_execute"
);
DBUG_ENTER
(
"mysql_sql_stmt_execute"
);
DBUG_PRINT
(
"info"
,
(
"EXECUTE: %.*s
\n
"
,
(
int
)
name
->
length
,
name
->
str
));
DBUG_PRINT
(
"info"
,
(
"EXECUTE: %.*s"
,
(
int
)
name
->
length
,
name
->
str
));
if
(
!
(
stmt
=
(
Prepared_statement
*
)
thd
->
stmt_map
.
find_by_name
(
name
)))
if
(
!
(
stmt
=
(
Prepared_statement
*
)
thd
->
stmt_map
.
find_by_name
(
name
)))
{
{
...
@@ -3512,7 +3512,7 @@ void mysql_sql_stmt_close(THD *thd)
...
@@ -3512,7 +3512,7 @@ void mysql_sql_stmt_close(THD *thd)
{
{
Prepared_statement
*
stmt
;
Prepared_statement
*
stmt
;
LEX_CSTRING
*
name
=
&
thd
->
lex
->
prepared_stmt_name
;
LEX_CSTRING
*
name
=
&
thd
->
lex
->
prepared_stmt_name
;
DBUG_PRINT
(
"info"
,
(
"DEALLOCATE PREPARE: %.*s
\n
"
,
(
int
)
name
->
length
,
DBUG_PRINT
(
"info"
,
(
"DEALLOCATE PREPARE: %.*s"
,
(
int
)
name
->
length
,
name
->
str
));
name
->
str
));
if
(
!
(
stmt
=
(
Prepared_statement
*
)
thd
->
stmt_map
.
find_by_name
(
name
)))
if
(
!
(
stmt
=
(
Prepared_statement
*
)
thd
->
stmt_map
.
find_by_name
(
name
)))
...
...
sql/wsrep_mysqld.cc
View file @
716d396b
...
@@ -2091,7 +2091,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
...
@@ -2091,7 +2091,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
need to know the start of the stack so that we could check for
need to know the start of the stack so that we could check for
stack overruns.
stack overruns.
*/
*/
DBUG_PRINT
(
"wsrep"
,
(
"handle_one_connection called by thread %lld
\n
"
,
DBUG_PRINT
(
"wsrep"
,
(
"handle_one_connection called by thread %lld"
,
(
long
long
)
thd
->
thread_id
));
(
long
long
)
thd
->
thread_id
));
/* now that we've called my_thread_init(), it is safe to call DBUG_* */
/* now that we've called my_thread_init(), it is safe to call DBUG_* */
...
...
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