diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:57:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:57:44 +0300 |
| commit | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (patch) | |
| tree | a009b70e1c934e05a30390fa4b5a5dbca4153154 /sql/share | |
| parent | 381ad2ec6a2bb8c951b88274598e304f695ed04c (diff) | |
| parent | 453eb014f7f44cf92fa40887e17a253338c696fb (diff) | |
| download | mariadb-git-cd6e15989044e5d4a708a6ee191bcd3c13dc0071.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 6 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 62f49250a1a..2b2d60c0657 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -4620,7 +4620,7 @@ ER_USER_LIMIT_REACHED 42000 swe "Användare '%-.64s' har överskridit '%s' (nuvarande värde: %ld)" ER_SPECIFIC_ACCESS_DENIED_ERROR 42000 nla "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie" - eng "Access denied; you need the %-.128s privilege for this operation" + eng "Access denied; you need (at least one of) the %-.128s privilege(s) for this operation" ger "Kein Zugriff. Hierfür wird die Berechtigung %-.128s benötigt" ita "Accesso non consentito. Serve il privilegio %-.128s per questa operazione" por "Acesso negado. Você precisa o privilégio %-.128s para essa operação" @@ -6237,3 +6237,7 @@ ER_COND_ITEM_TOO_LONG ER_UNKNOWN_LOCALE eng "Unknown locale: '%-.64s'" + +ER_SLAVE_IGNORE_SERVER_IDS + eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id" + diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index bec7536b5d1..317087854c1 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -4620,7 +4620,7 @@ ER_USER_LIMIT_REACHED 42000 swe "Användare '%-.64s' har överskridit '%s' (nuvarande värde: %ld)" ER_SPECIFIC_ACCESS_DENIED_ERROR 42000 nla "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie" - eng "Access denied; you need the %-.128s privilege for this operation" + eng "Access denied; you need (at least one of) the %-.128s privilege(s) for this operation" ger "Kein Zugriff. Hierfür wird die Berechtigung %-.128s benötigt" ita "Accesso non consentito. Serve il privilegio %-.128s per questa operazione" por "Acesso negado. Você precisa o privilégio %-.128s para essa operação" @@ -6237,3 +6237,7 @@ ER_COND_ITEM_TOO_LONG ER_UNKNOWN_LOCALE eng "Unknown locale: '%-.64s'" + +ER_SLAVE_IGNORE_SERVER_IDS + eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id" + |