diff options
| author | unknown <serg@serg.mylan> | 2005-03-23 19:18:25 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-23 19:18:25 +0100 |
| commit | c9659f0e6ddad0f9d550d5d871f5288f00f000da (patch) | |
| tree | c81ed81f8edf508e7b1bccb6abe3f8785be6b857 /sql/share | |
| parent | d27a709f3d811718c4174beeb0bd2d964bfcf87c (diff) | |
| download | mariadb-git-c9659f0e6ddad0f9d550d5d871f5288f00f000da.tar.gz | |
sql/sql_acl.cc
report correct errror in MODE_NO_AUTO_CREATE_USER
cleanup
after merge fixes
mysql-test/r/grant2.result:
updated after merge
mysql-test/r/grant3.result:
updated after merge
mysql-test/r/rpl_temporary.result:
sqlstate fixed
mysql-test/t/grant2.test:
updated after merge
mysql-test/t/grant3.test:
updated after merge
sql/share/errmsg.txt:
sqlstate fixed
sql/sql_acl.cc:
report correct errror in MODE_NO_AUTO_CREATE_USER
cleanup
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 886c37b7061..6b254f47284 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -4637,7 +4637,7 @@ ER_USER_LIMIT_REACHED 42000 rus "ðÏÌØÚÏ×ÁÔÅÌØ '%-.64s' ÐÒÅ×ÙÓÉÌ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÒÅÓÕÒÓÁ '%s' (ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ: %ld)" spa "Usuario '%-.64s' ha excedido el recurso '%s' (actual valor: %ld)" swe "Användare '%-.64s' har överskridit '%s' (nuvarande värde: %ld)" -ER_SPECIFIC_ACCESS_DENIED_ERROR +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" ger "Befehl nicht zulässig. Hierfür wird die Berechtigung %-.128s benötigt" @@ -5332,5 +5332,5 @@ ER_STARTUP eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d %s" ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR eng "Can't load value from file with fixed size rows to variable" -ER_CANT_CREATE_USER_WITH_GRANT +ER_CANT_CREATE_USER_WITH_GRANT 42000 eng "You are not allowed to create a user with GRANT" |