MDEV-22189: Change error messages inside code to have mariadb instead ofbb-10.6-MDEV-22189

mysql

Fix: Changed error messages, rerecorded results and changed other relevant
files.

3 files changed, 7 insertions, 7 deletions

diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 248f4255b8b..cfad1b25a47 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -209,7 +209,7 @@ 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 "
+                        "may break when this MariaDB server acts as a "
                         "slave and has his hostname changed!! Please "
                         "use '--log-basename=#' or '--relay-log=%s' to avoid "
                         "this problem.", ln);
diff --git a/sql/slave.cc b/sql/slave.cc
index 5a5e83b977b..b930710cd26 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1766,7 +1766,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
   {
     errmsg= err_buff2;
     snprintf(err_buff2, sizeof(err_buff2),
-             "Master reported unrecognized MySQL version: %s",
+             "Master reported unrecognized MariaDB version: %s",
              mysql->server_version);
     err_code= ER_SLAVE_FATAL_ERROR;
     sprintf(err_buff, ER_DEFAULT(err_code), err_buff2);
@@ -1782,7 +1782,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
     case 2:
       errmsg= err_buff2;
       snprintf(err_buff2, sizeof(err_buff2),
-               "Master reported unrecognized MySQL version: %s",
+               "Master reported unrecognized MariaDB version: %s",
                mysql->server_version);
       err_code= ER_SLAVE_FATAL_ERROR;
       sprintf(err_buff, ER_DEFAULT(err_code), err_buff2);
@@ -1955,7 +1955,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
         !mi->rli.replicate_same_server_id)
     {
       errmsg= "The slave I/O thread stops because master and slave have equal \
-MySQL server ids; these ids must be different for replication to work (or \
+MariaDB server ids; these ids must be different for replication to work (or \
 the --replicate-same-server-id option must be used on slave but this does \
 not always make sense; please check the manual before using it).";
       err_code= ER_SLAVE_FATAL_ERROR;
@@ -2115,7 +2115,7 @@ be equal for the Statement-format replication to work";
       /* We use ERROR_LEVEL to get the error logged to file */
       mi->report(ERROR_LEVEL, err_code, NULL,
 
-                 "MySQL master doesn't have a TIME_ZONE variable. Note that"
+                 "MariaDB master doesn't have a TIME_ZONE variable. Note that"
                  "if your timezone is not same between master and slave, your "
                  "slave may get wrong data into timestamp columns");
     }
@@ -4438,7 +4438,7 @@ Could not parse relay log event entry. The possible reasons are: the master's \
 binary log is corrupted (you can check this by running 'mysqlbinlog' on the \
 binary log), the slave's relay log is corrupted (you can check this by running \
 'mysqlbinlog' on the relay log), a network problem, or a bug in the master's \
-or slave's MySQL code. If you want to check the master's binary log or slave's \
+or slave's MariaDB code. If you want to check the master's binary log or slave's \
 relay log, you will be able to know their names by issuing 'SHOW SLAVE STATUS' \
 on this slave.\
 ");
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b1cc696e9fe..8335eb0f7fa 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -10068,7 +10068,7 @@ char *thd_get_error_context_description(THD *thd, char *buffer,
   size_t len;
 
   len= my_snprintf(header, sizeof(header),
-                   "MySQL thread id %u, OS thread handle %lu, query id %llu",
+                   "MariaDB thread id %u, OS thread handle %lu, query id %llu",
                    (uint)thd->thread_id, (ulong) thd->real_id, (ulonglong) thd->query_id);
   str.length(0);
   str.append(header, len);