diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-20 14:59:42 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-20 14:59:42 +0200 |
| commit | 37b6043070ebed97158c4ef9e3c8534a8c23c860 (patch) | |
| tree | f0b0fae716640619475cf5f3d5363d0ca84f609e /sql/share/errmsg.txt | |
| parent | ec7c4fb442842b46029f28355ece7d0104ea63ac (diff) | |
| download | mariadb-git-37b6043070ebed97158c4ef9e3c8534a8c23c860.tar.gz | |
WL#3352: Extending Partitioning Types and new partition function
Moved the new errors back to the end of errmsg.txt
Updated two tests with new error message
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index a379b11c812..87ac1810c8e 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5822,8 +5822,6 @@ ER_SAME_NAME_PARTITION eng "Duplicate partition name %-.192s" ger "Doppelter Partitionsname: %-.192s" swe "Duplicerat partitionsnamn %-.192s" -ER_SAME_NAME_PARTITION_FIELD - eng "Duplicate partition field name %-.192s" ER_NO_BINLOG_ERROR eng "It is not allowed to shut off binlog on this command" ger "Es es nicht erlaubt, bei diesem Befehl binlog abzuschalten" @@ -6182,14 +6180,6 @@ ER_TOO_LONG_FIELD_COMMENT ER_FUNC_INEXISTENT_NAME_COLLISION 42000 eng "FUNCTION %s does not exist. Check the 'Function Name Parsing and Resolution' section in the Reference Manual" -ER_PARTITION_COLUMN_LIST_ERROR - eng "Inconsistency in usage of column lists for partitioning" -ER_WRONG_TYPE_COLUMN_VALUE_ERROR - eng "Partition column values of incorrect type" -ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR - eng "Too many fields in '%s'" -ER_MAXVALUE_IN_LIST_PARTITIONING_ERROR - eng "Cannot use MAXVALUE as value in List partitioning" # When updating these, please update EXPLAIN_FILENAME_MAX_EXTRA_LENGTH in # mysql_priv.h with the new maximal additional length for explain_filename. @@ -6216,3 +6206,13 @@ 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" +ER_PARTITION_COLUMN_LIST_ERROR + eng "Inconsistency in usage of column lists for partitioning" +ER_WRONG_TYPE_COLUMN_VALUE_ERROR + eng "Partition column values of incorrect type" +ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR + eng "Too many fields in '%-.192s'" +ER_MAXVALUE_IN_LIST_PARTITIONING_ERROR + eng "Cannot use MAXVALUE as value in List partitioning" |