diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-17 03:20:11 -0600 |
| commit | 071634bb3578a3949e09197f7eb17c5619d01562 (patch) | |
| tree | d0d731222454addb05b3890fb2bc555da5af7d63 /sql/share | |
| parent | ea0d4516ed796179ef97a791bb04a646ac98610b (diff) | |
| parent | c65bfe456456db2aa60e2275b9ca428c76bbede4 (diff) | |
| download | mariadb-git-071634bb3578a3949e09197f7eb17c5619d01562.tar.gz | |
Merge mysql-next-mr --> mysql-trunk-signal
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 4c5a4bf120f..49707f09ca5 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6178,17 +6178,17 @@ ER_FUNC_INEXISTENT_NAME_COLLISION 42000 # 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" |