summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2013-05-08 12:52:12 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2013-05-08 12:52:12 +0200
commit7df0ee6c9e41ce4048670d179db6c27649d6d5d8 (patch)
tree4416256b6cd94541758bdfb405a22b8ac5cf46b9 /sql/share
parentc334bc8cfdd584bb35a36a296bd46189379c0ac3 (diff)
downloadmariadb-git-7df0ee6c9e41ce4048670d179db6c27649d6d5d8.tar.gz
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.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 0 insertions, 2 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.
#