MDEV-21851: Error in BINLOG_BASE64_EVENT i s always error-logged as if it is done by Slave

The prefix of error log message out of a failed BINLOG applying
is corrected to be the sql command name.

4 files changed, 8 insertions, 6 deletions

diff --git a/sql/rpl_reporting.cc b/sql/rpl_reporting.cc
index 738ae52782d..aa69168d44c 100644
--- a/sql/rpl_reporting.cc
+++ b/sql/rpl_reporting.cc
@@ -19,6 +19,7 @@
 #include "rpl_reporting.h"
 #include "log.h" // sql_print_error, sql_print_warning,
                  // sql_print_information
+#include "sql_class.h"
 
 Slave_reporting_capability::Slave_reporting_capability(char const *thread_name)
   : m_thread_name(thread_name)
@@ -70,7 +71,8 @@ Slave_reporting_capability::report(loglevel level, int err_code,
   va_end(args);
 
   /* If the msg string ends with '.', do not add a ',' it would be ugly */
-  report_function("Slave %s: %s%s %s%sInternal MariaDB error code: %d",
+  report_function("%s %s: %s%s %s%sInternal MariaDB error code: %d",
+                  (current_thd && current_thd->rgi_fake) ? "" : "Slave",
                   m_thread_name, pbuff,
                   (pbuff[0] && *(strend(pbuff)-1) == '.') ? "" : ",",
                   (extra_info ? extra_info : ""), (extra_info ? ", " : ""),
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index c11889a08cd..d8ef17e3494 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -46,8 +46,8 @@ gtid_waiting rpl_global_gtid_waiting;
 
 const char *const Relay_log_info::state_delaying_string = "Waiting until MASTER_DELAY seconds after master executed event";
 
-Relay_log_info::Relay_log_info(bool is_slave_recovery)
-  :Slave_reporting_capability("SQL"),
+Relay_log_info::Relay_log_info(bool is_slave_recovery, const char* thread_name)
+  :Slave_reporting_capability(thread_name),
    replicate_same_server_id(::replicate_same_server_id),
    info_fd(-1), cur_log_fd(-1), relay_log(&sync_relaylog_period),
    sync_counter(0), is_relay_log_recovery(is_slave_recovery),
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index f89b40b1efc..4223e015ecd 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -387,11 +387,11 @@ public:
   */
   slave_connection_state restart_gtid_pos;
 
-  Relay_log_info(bool is_slave_recovery);
+  Relay_log_info(bool is_slave_recovery, const char* thread_name= "SQL");
   ~Relay_log_info();
 
   /*
-    Invalidate cached until_log_name and group_relay_log_name comparison 
+    Invalidate cached until_log_name and group_relay_log_name comparison
     result. Should be called after any update of group_realy_log_name if
     there chances that sql_thread is running.
   */
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index 4895eebdeb2..0011487f1dc 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -211,7 +211,7 @@ void mysql_client_binlog_statement(THD* thd)
   size_t coded_len= 0, decoded_len= 0;
 
   rli= thd->rli_fake;
-  if (!rli && (rli= thd->rli_fake= new Relay_log_info(FALSE)))
+  if (!rli && (rli= thd->rli_fake= new Relay_log_info(FALSE, "BINLOG_BASE64_EVENT")))
     rli->sql_driver_thd= thd;
   if (!(rgi= thd->rgi_fake))
     rgi= thd->rgi_fake= new rpl_group_info(rli);