diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 09:21:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-18 09:21:59 +0300 |
| commit | cc2651b74cbbd8c96fafeb66ca16ca4c2344a4f0 (patch) | |
| tree | 808f9e33addba69df949e981ca1f87d284eaddee /sql/rpl_rli.cc | |
| parent | 81402c131875c5fc2c3c4078bc12770304a48861 (diff) | |
| parent | 4240704abc2d51a2e46fb85049b601fce5d5b24c (diff) | |
| download | mariadb-git-cc2651b74cbbd8c96fafeb66ca16ca4c2344a4f0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 4c04382a5dc..9a40114ad36 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -209,8 +209,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; |