summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Ivanov <pivanof@google.com>2015-07-16 15:50:26 -0700
committerSergei Golubchik <serg@mariadb.org>2015-10-09 12:46:56 +0200
commitbff1af983ad7b0bed6c3973e4d13297df5fe2791 (patch)
treed038b899c291918a979ef9b62392803a0d41c5ea
parent0ea42333d37d3eda13e8756dba9c34778f5da47d (diff)
downloadmariadb-git-bff1af983ad7b0bed6c3973e4d13297df5fe2791.tar.gz
Clarify the log message about master_info and relay_info files.
Just "Master" could be understood as the master IP or hostname and thus can cause confusion to db admins. "Master connection name" clearly states that the log line contains connection name in the (possibly) multi-master setup.
-rw-r--r--sql/sql_repl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index d6a4819172d..69fb2150764 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -3322,7 +3322,8 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added)
*master_info_added= true;
}
if (global_system_variables.log_warnings > 1)
- sql_print_information("Master: '%.*s' Master_info_file: '%s' "
+ sql_print_information("Master connection name: '%.*s' "
+ "Master_info_file: '%s' "
"Relay_info_file: '%s'",
(int) mi->connection_name.length,
mi->connection_name.str,