summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 08:40:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 08:40:19 +0300
commitca3f497564f93d2d70d024d996bcd1136bddc5ab (patch)
treec89f50b5dd0f2a23d6c1511844c5196909bc5325 /sql/rpl_rli.cc
parent9f03a394fff4ae55553eb694f7cba56db15fdb7b (diff)
parentb9a2e4609f93f2cab253f02bc7535960852de3c5 (diff)
downloadmariadb-git-ca3f497564f93d2d70d024d996bcd1136bddc5ab.tar.gz
Merge 10.2 into 10.3, except MDEV-25682
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r--sql/rpl_rli.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 58594f6f645..88cb8fc5e1e 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -207,8 +207,8 @@ a file name for --relay-log-index option", opt_relaylog_index_name);
*/
sql_print_warning("Neither --relay-log nor --relay-log-index were used;"
" so replication "
- "may break when this MySQL server acts as a "
- "slave and has his hostname changed!! Please "
+ "may break when this MariaDB server acts as a "
+ "replica and has its hostname changed. Please "
"use '--log-basename=#' or '--relay-log=%s' to avoid "
"this problem.", ln);
name_warning_sent= 1;