diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
| commit | 93e02adcfab140265d3baf2062057826b3a28bc2 (patch) | |
| tree | 11acbcf83ba9f40be4d590a80de9558743535f17 /sql/share | |
| parent | 6e7a37d3e8fc1f32c382dae143eb091be1eb1e8f (diff) | |
| parent | df129b749d609b75077ab7d60d65d40ff77b8299 (diff) | |
| download | mariadb-git-93e02adcfab140265d3baf2062057826b3a28bc2.tar.gz | |
Manual merge mysql-trunk -> mysql-trunk-wl3352
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 78eb0e09c11..a379b11c812 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6194,17 +6194,17 @@ ER_MAXVALUE_IN_LIST_PARTITIONING_ERROR # When updating these, please update EXPLAIN_FILENAME_MAX_EXTRA_LENGTH in # mysql_priv.h with the new maximal additional length for explain_filename. ER_DATABASE_NAME - eng "Database `%s`" - swe "Databas `%s`" + eng "Database" + swe "Databas" ER_TABLE_NAME - eng "Table `%s`" - swe "Tabell `%s`" + eng "Table" + swe "Tabell" ER_PARTITION_NAME - eng "Partition `%s`" - swe "Partition `%s`" + eng "Partition" + swe "Partition" ER_SUBPARTITION_NAME - eng "Subpartition `%s`" - swe "Subpartition `%s`" + eng "Subpartition" + swe "Subpartition" ER_TEMPORARY_NAME eng "Temporary" swe "Temporär" |