summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2019-10-21 18:41:58 +0300
committerMichael Widenius <monty@mariadb.org>2019-10-21 18:41:58 +0300
commit716d396bb3b4814de3c00c46f98317c45a33551e (patch)
treeda5fc3bf22e0f7441a4289cf0a42370aef17b897
parent06d2e1d828140d887adb68b05c85d5107baf816c (diff)
downloadmariadb-git-716d396bb3b4814de3c00c46f98317c45a33551e.tar.gz
Remove \n from DBUG_PRINT statements
-rw-r--r--sql/log.cc2
-rw-r--r--sql/rpl_rli.cc2
-rw-r--r--sql/semisync_master.cc2
-rw-r--r--sql/sql_lex.cc2
-rw-r--r--sql/sql_lex.h2
-rw-r--r--sql/sql_load.cc2
-rw-r--r--sql/sql_prepare.cc4
-rw-r--r--sql/wsrep_mysqld.cc2
8 files changed, 9 insertions, 9 deletions
diff --git a/sql/log.cc b/sql/log.cc
index fe8ec38bacd..900cc1b8197 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -7690,7 +7690,7 @@ MYSQL_BIN_LOG::queue_for_group_commit(group_commit_entry *orig_entry)
mysql_mutex_unlock(&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"));
DBUG_RETURN(orig_queue == NULL);
}
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 5a99de52462..78c541d4721 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -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();
server_id= (uint32)table->field[2]->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,
(ulong)seq_no, (ulong)sub_id));
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc
index f9fb4d9147d..b239a9776a7 100644
--- a/sql/semisync_master.cc
+++ b/sql/semisync_master.cc
@@ -806,7 +806,7 @@ int Repl_semi_sync_master::commit_trx(const char* trx_wait_binlog_name,
if (!get_master_enabled() || !is_on())
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",
trx_wait_binlog_name, (ulong)trx_wait_binlog_pos,
(int)is_on()));
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index d3c98115659..3e5411c3428 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -7314,7 +7314,7 @@ uint binlog_unsafe_map[256];
#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(b), \
c)); \
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 03e73e23d3d..87eea6c0a8b 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -2077,7 +2077,7 @@ public:
unsafe= (binlog_unsafe_map[stmt_accessed_table_flag] & condition);
#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] & condition)));
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 1459c50ba9e..d5692196457 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -2063,7 +2063,7 @@ int READ_INFO::read_xml(THD *thd)
chr= read_value(delim, &value);
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,
attribute.c_ptr_safe(),
value.c_ptr_safe()));
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index d734c9ab588..da6ec106208 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -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 */
String expanded_query;
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)))
{
@@ -3512,7 +3512,7 @@ void mysql_sql_stmt_close(THD *thd)
{
Prepared_statement* stmt;
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));
if (! (stmt= (Prepared_statement*) thd->stmt_map.find_by_name(name)))
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 08adaac0e85..9ad7a6e3bbc 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -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
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));
/* now that we've called my_thread_init(), it is safe to call DBUG_* */