summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-10-22 16:15:06 +0200
committerMikael Ronstrom <mikael@mysql.com>2009-10-22 16:15:06 +0200
commit6f27ad15b208091d3904bb4f73ffab2871f99581 (patch)
tree0bcd1e2792ff22088f2d5faa233170a48ebeb79a /sql/share/errmsg.txt
parentf3f4e41c3704b6a82942de5fd6c918319e0e4bb2 (diff)
downloadmariadb-git-6f27ad15b208091d3904bb4f73ffab2871f99581.tar.gz
A lot of fixes to make character set work ok, first step to fixing BUG#48163
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 0bbdacee0bc..d65945013b9 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6207,7 +6207,7 @@ ER_TOO_MANY_CONCURRENT_TRXS
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
eng "Non-ASCII separator arguments are not fully supported"
ER_SAME_NAME_PARTITION_FIELD
- eng "Duplicate partition field name %-.192s"
+ eng "Duplicate partition field name '%-.192s'"
ER_PARTITION_COLUMN_LIST_ERROR
eng "Inconsistency in usage of column lists for partitioning"
ER_WRONG_TYPE_COLUMN_VALUE_ERROR
@@ -6220,3 +6220,5 @@ ER_TOO_MANY_VALUES_ERROR
eng "Cannot have more than one value for this type of %-.64s partitioning"
ER_ROW_SINGLE_PARTITION_FIELD_ERROR
eng "Row expressions in VALUES IN only allowed for multi-field column partitioning"
+ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD
+ eng "Field '%-.192s' is of a not allowed type for this type of partitioning"