diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index e3bdf3fc8ef..e7ef0f74f1e 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6506,8 +6506,6 @@ ER_UNSUPPORTED_ENGINE
 ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST
   eng "INSERT into autoincrement field which is not the first part in the composed primary key is unsafe."
 
-WARN_ON_BLOCKHOLE_IN_RBR
-  eng "Row events are not logged for %s statements that modify BLACKHOLE tables in row format. Table(s): '%-.192s'"
 #
 #  End of 5.5 error messages.
 #
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a2e30bda20a..fb4ed99b8bb 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4443,8 +4443,10 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         */
         table_names.replace(table_names.length()-1, 1, ".", 1);
         push_warning_printf(this, MYSQL_ERROR::WARN_LEVEL_WARN,
-                            WARN_ON_BLOCKHOLE_IN_RBR,
-                            ER(WARN_ON_BLOCKHOLE_IN_RBR),
+                            ER_UNKNOWN_ERROR,
+                            "Row events are not logged for %s statements "
+                            "that modify BLACKHOLE tables in row format. "
+                            "Table(s): '%-.192s'",
                             is_update ? "UPDATE" : "DELETE",
                             table_names.c_ptr());
       }