1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSING

Browse Source 
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.
This commit is contained in:
Jon Olav Hauglid 2013-05-08 12:52:12 +02:00
parent ff55c9da68
commit 4f858dcd0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/share/errmsg-utf8.txt
View File

@ -6506,8 +6506,6 @@ ER_UNSUPPORTED_ENGINE
ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST
eng "INSERT into autoincrement field which is not the first part in the composed primary key is unsafe." 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. # End of 5.5 error messages.
# #

6
sql/sql_class.cc
View File

@ -4443,8 +4443,10 @@ int THD::decide_logging_format(TABLE_LIST *tables)
*/ */
table_names.replace(table_names.length()-1, 1, ".", 1); table_names.replace(table_names.length()-1, 1, ".", 1);
push_warning_printf(this, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning_printf(this, MYSQL_ERROR::WARN_LEVEL_WARN,
WARN_ON_BLOCKHOLE_IN_RBR, ER_UNKNOWN_ERROR,
ER(WARN_ON_BLOCKHOLE_IN_RBR), "Row events are not logged for %s statements "
"that modify BLACKHOLE tables in row format. "
"Table(s): '%-.192s'",
is_update ? "UPDATE" : "DELETE", is_update ? "UPDATE" : "DELETE",
table_names.c_ptr()); table_names.c_ptr());
} }