create/drop/rename user cleanup

dbug/user.r:
  help cralified
include/mysqld_error.h:
  new error message added
mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/t/grant.test:
  results updated
mysql-test/t/grant2.test:
  results updated
sql/share/czech/errmsg.txt:
  error message updated
sql/share/danish/errmsg.txt:
  error message updated
sql/share/dutch/errmsg.txt:
  error message updated
sql/share/english/errmsg.txt:
  error message updated
sql/share/estonian/errmsg.txt:
  error message updated
sql/share/french/errmsg.txt:
  error message updated
sql/sql_acl.cc:
  changed error reporting for create/drop/rename user to be consistent with drop table
sql/share/german/errmsg.txt:
  error message updated
sql/share/greek/errmsg.txt:
  error message updated
sql/share/hungarian/errmsg.txt:
  error message updated
sql/share/italian/errmsg.txt:
  error message updated
sql/share/japanese/errmsg.txt:
  error message updated
sql/share/korean/errmsg.txt:
  error message updated
sql/share/norwegian-ny/errmsg.txt:
  error message updated
sql/share/norwegian/errmsg.txt:
  error message updated
sql/share/polish/errmsg.txt:
  error message updated
sql/share/portuguese/errmsg.txt:
  error message updated
sql/share/romanian/errmsg.txt:
  error message updated
sql/share/russian/errmsg.txt:
  error message updated
sql/share/serbian/errmsg.txt:
  error message updated
sql/share/slovak/errmsg.txt:
  error message updated
sql/share/spanish/errmsg.txt:
  error message updated
sql/share/swedish/errmsg.txt:
  error message updated
sql/share/ukrainian/errmsg.txt:
  error message updated

23 files changed, 46 insertions, 23 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 54d22e62dba..e8ea55f0739 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -296,7 +296,7 @@ character-set=latin2
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -424,3 +424,4 @@ character-set=latin2
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 7385be9545c..3664e5ba0ef 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -287,7 +287,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -415,3 +415,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 7015ed90789..cd71ddc3588 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -296,7 +296,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -424,3 +424,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 54ca033657e..3050f94936f 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -284,7 +284,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for %.256s",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index b89ebb42500..58b032ceb14 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -289,7 +289,7 @@ character-set=latin7
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -417,3 +417,4 @@ character-set=latin7
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 4e370a63099..a93a52606a9 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -284,7 +284,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index b4afa45ee46..e657f9cb16a 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -297,7 +297,7 @@ character-set=latin1
 "Daten abgeschnitten für Spalte '%s' in Zeile %ld",
 "Für Tabelle '%s' wird Speicher-Engine %s benutzt",
 "Unerlaubte Vermischung der Kollationen (%s,%s) und (%s,%s) für die Operation '%s'",
-"Das Kommando %s scheiterte für %d von den betroffenen Benutzern",
+"Kann einen oder mehrere der angegebenen Benutzer nicht löschen",
 "Kann nicht alle Berechtigungen widerrufen, grant for one or more of the requested users",
 "Unerlaubte Vermischung der Kollationen (%s,%s), (%s,%s), (%s,%s) für die Operation '%s'",
 "Unerlaubte Vermischung der Kollationen für die Operation '%s'",
@@ -425,3 +425,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Das Kommando %s scheiterte für %.256s",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index afc91d0c69e..0bfcf513001 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -284,7 +284,7 @@ character-set=greek
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=greek
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 61c112170b2..51338770817 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -289,7 +289,7 @@ character-set=latin2
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -417,3 +417,4 @@ character-set=latin2
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index e6a00332093..f7f553c0eca 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -284,7 +284,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 98282af52d6..694447caa48 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -288,7 +288,7 @@ character-set=ujis
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -416,3 +416,4 @@ character-set=ujis
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index b10a83beee9..3916b10666d 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -284,7 +284,7 @@ character-set=euckr
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=euckr
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index e5a41b7d3d9..8165dc142fe 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -286,7 +286,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -414,3 +414,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 334313c1916..477c527968a 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -286,7 +286,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -414,3 +414,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 0d8deb30e77..5c56730068d 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -289,7 +289,7 @@ character-set=latin2
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -417,3 +417,4 @@ character-set=latin2
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index e47a69a5c25..2ccde22a78f 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -286,7 +286,7 @@ character-set=latin1
 "Dado truncado para coluna '%s' na linha %ld",
 "Usando engine de armazenamento %s para tabela '%s'",
 "Combinação ilegal de collations (%s,%s) e (%s,%s) para operação '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Não pode revocar todos os privilégios, grant para um ou mais dos usuários pedidos",
 "Ilegal combinação de collations (%s,%s), (%s,%s), (%s,%s) para operação '%s'",
 "Ilegal combinação de collations para operação '%s'",
@@ -414,3 +414,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index c5a63223c22..2b2f6aa45a8 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -289,7 +289,7 @@ character-set=latin2
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -417,3 +417,4 @@ character-set=latin2
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 04c51d5f532..58301983b25 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -289,7 +289,7 @@ character-set=koi8r
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -417,3 +417,4 @@ character-set=koi8r
 "îÅÌØÚÑ ÉÚÍÅÎÉÔØ ÂÏÌØÛÅ ÞÅÍ ÏÄÎÕ ÂÁÚÏ×ÕÀ ÔÁÂÌÉÃÕ ÉÓÐÏÌØÚÕÑ ÍÎÏÇÏÔÁÂÌÉÞÎÙÊ VIEW '%-.64s.%-.64s'"
 "îÅÌØÚÑ ×ÓÔÁ×ÌÑÔØ ÚÁÐÉÓÉ × ÍÎÏÇÏÔÁÂÌÉÞÎÙÊ VIEW '%-.64s.%-.64s' ÂÅÚ ÓÐÉÓËÁ ÐÏÌÅÊ"
 "îÅÌØÚÑ ÕÄÁÌÑÔØ ÉÚ ÍÎÏÇÏÔÁÂÌÉÞÎÏÇÏ VIEW '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index f267faeccbd..a245da6b677 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -277,7 +277,7 @@ character-set=cp1250
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -405,3 +405,4 @@ character-set=cp1250
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 8b7bb730cf0..69eddcfa9f6 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -292,7 +292,7 @@ character-set=latin2
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -420,3 +420,4 @@ character-set=latin2
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index c0e663d6484..0eefed18088 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -288,7 +288,7 @@ character-set=latin1
 "Datos truncados para columna '%s' en la línea %ld",
 "Usando motor de almacenamiento %s para tabla '%s'",
 "Ilegal mezcla de collations (%s,%s) y (%s,%s) para operación '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "No puede revocar todos los privilegios, derecho para uno o mas de los usuarios solicitados",
 "Ilegal mezcla de collations (%s,%s), (%s,%s), (%s,%s) para operación '%s'",
 "Ilegal mezcla de collations para operación '%s'",
@@ -416,3 +416,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 831ccfbe978..be42d3889d0 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -284,7 +284,7 @@ character-set=latin1
 "Data truncated for column '%s' at row %ld",
 "Använder handler %s för tabell '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -412,3 +412,4 @@ character-set=latin1
 "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
 "Can not insert into join view '%-.64s.%-.64s' without fields list"
 "Can not delete from join view '%-.64s.%-.64s'"
+"Operation %s failed for '%.256s'",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 46a0adf922f..6d4c37803c7 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -290,7 +290,7 @@ character-set=koi8u
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
-"Operation %s failed for %d of the requested users",
+"Cannot drop one or more of the requested users",
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
@@ -418,3 +418,4 @@ character-set=koi8u
 "îÅÍÏÖÌÉ×Ï ÏÎÏ×ÉÔÉ Â¦ÌØÛ ÎÉÖ ÏÄÎÕ ÂÁÚÏ×Õ ÔÁÂÌÉÃÀ ×ÙËÏÒÉÓÔÏ×ÕÀÞÉ VIEW '%-.64s.%-.64s', ÝÏ Í¦ÓÔ¦ÔØ ÄÅ˦ÌØËÁ ÔÁÂÌÉÃØ"
 "îÅÍÏÖÌÉ×Ï ÕÓÔÁ×ÉÔÉ ÒÑÄËÉ Õ VIEW '%-.64s.%-.64s', ÝÏ Í¦ÓÔÉÔØ ÄÅ˦ÌØËÁ ÔÁÂÌÉÃØ, ÂÅÚ ÓÐÉÓËÕ ÓÔÏ×Âæ×"
 "îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ ÒÑÄËÉ Õ VIEW '%-.64s.%-.64s', ÝÏ Í¦ÓÔÉÔØ ÄÅ˦ÌØËÁ ÔÁÂÌÉÃØ"
+"Operation %s failed for '%.256s'",