From 4f858dcd0c8914f9a9c5e83087a277d63385ffc0 Mon Sep 17 00:00:00 2001 From: Jon Olav Hauglid Date: Wed, 8 May 2013 12:52:12 +0200 Subject: [PATCH] Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSING NUMBER ALREADY USED BY 5.6 The problem was that the patch for Bug#13004581 added a new error message to 5.5. This causes it to use an error number already used in 5.6 by ER_CANNOT_LOAD_FROM_TABLE_V2. Which means that error message number stability between GA releases is broken. This patch fixes the problem by removing the error message and using ER_UNKNOWN_ERROR instead. --- sql/share/errmsg-utf8.txt | 2 -- sql/sql_class.cc | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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()); }