diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 15:52:26 -0700 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 15:52:26 -0700 |
| commit | f74b9eca6ebe83367fd742f6f537814dcdd6cc2f (patch) | |
| tree | 0f411f14c6e73ca4720966e73e94e9d22a460d70 /sql/share | |
| parent | 4ec26a7c2dbb2a49fbedf14f0ca7d126703916ae (diff) | |
| download | mariadb-git-f74b9eca6ebe83367fd742f6f537814dcdd6cc2f.tar.gz | |
remove ER_RESERVED_ROLE.
Only allow NONE instead of a role name in SET ROLE.
Don't allow PUBLIC as a role name anywhere (to be fixed later)
Fix db_access calculations on SET ROLE
Reduce the size of role_grants and parent_grantee per-user/role arrays.
Fix the wording and specify the correct sqlstate for ER_INVALID_ROLE
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 6135f8f1b96..cf2aa33f96e 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6562,15 +6562,12 @@ ER_NO_SUCH_QUERY eng "Unknown query id: %lld" ger "Unbekannte Abfrage-ID: %lld" rus "Неизвестный номер запроса: %lld" -ER_INVALID_ROLE - eng "The role '%s' has not been granted or is invalid." - rum "Rolul '%s' este invalid sau nu a fost acordat." +ER_INVALID_ROLE OP000 + eng "Invalid role specification %`s." + rum "Rolul %`s este invalid." ER_INVALID_CURRENT_USER eng "The current user is invalid." rum "Utilizatorul curent este invalid." -ER_RESERVED_ROLE - eng "Role name '%s' is reserved." - rum "Numele de rol '%s' este rezervat." ER_CANNOT_GRANT_ROLE eng "Cannot grant role '%s' to: %s." rum "Rolul '%s' nu poate fi acordat catre: %s." |