diff --git a/include/mysql/service_logger.h b/include/mysql/service_logger.h
index 5979901bdd0..35c2eb1e3a9 100644
--- a/include/mysql/service_logger.h
+++ b/include/mysql/service_logger.h
@@ -19,6 +19,7 @@
 #ifndef MYSQL_ABI_CHECK
 #include <stdarg.h>
 #endif
+#include <my_attribute.h>
 
 /**
   @file
@@ -65,8 +66,10 @@ extern struct logger_service_st {
                          unsigned long long size_limit,
                          unsigned int rotations);
   int (*close)(LOGGER_HANDLE *log);
-  int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr);
-  int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...);
+  int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
+    ATTRIBUTE_FORMAT_FPTR(printf, 2, 0);
+  int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...)
+    ATTRIBUTE_FORMAT_FPTR(printf, 2, 3);
   int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
   int (*rotate)(LOGGER_HANDLE *log);
 } *logger_service;
@@ -90,8 +93,10 @@ extern struct logger_service_st {
                              unsigned long long size_limit,
                              unsigned int rotations);
   int logger_close(LOGGER_HANDLE *log);
-  int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr);
-  int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...);
+  int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
+    ATTRIBUTE_FORMAT(printf, 2, 0);
+  int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...)
+    ATTRIBUTE_FORMAT(printf, 2, 3);
   int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
   int logger_rotate(LOGGER_HANDLE *log); 
 #endif
diff --git a/include/service_versions.h b/include/service_versions.h
index 97d1fc62b9b..ea74ac01bb9 100644
--- a/include/service_versions.h
+++ b/include/service_versions.h
@@ -26,7 +26,7 @@
 #define VERSION_base64                  0x0100
 #define VERSION_encryption              0x0300
 #define VERSION_encryption_scheme       0x0100
-#define VERSION_logger                  0x0100
+#define VERSION_logger                  0x0200
 #define VERSION_my_crypt                0x0100
 #define VERSION_my_md5                  0x0100
 #define VERSION_my_print_error          0x0200
diff --git a/plugin/sql_errlog/sql_errlog.c b/plugin/sql_errlog/sql_errlog.c
index 6608bda5cce..cb7efef0ef6 100644
--- a/plugin/sql_errlog/sql_errlog.c
+++ b/plugin/sql_errlog/sql_errlog.c
@@ -118,7 +118,7 @@ static void log_sql_errors(MYSQL_THD thd __attribute__((unused)),
         if (event->database.str)
         {
           logger_printf(logfile, "%04d-%02d-%02d %2d:%02d:%02d %lu "
-                      "%s %`s %s %d: %s : %s \n",
+                      "%s %sQ %s %d: %s : %s \n",
               t.tm_year + 1900, t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min,
               t.tm_sec, event->general_thread_id, event->general_user,
               event->database.str, type,