Reverted Sinisa's patch "Fixing the error messages returned on GRANT

commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)


sql/share/english/errmsg.txt:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)
sql/sql_acl.cc:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)

sql/share/english/errmsg.txt

@@ -134,7 +134,7 @@
 "Host '%-.64s' is not allowed to connect to this MySQL server",
 "You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
-"Password string is of inadequate length",
+"Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
 "Can't create a new thread (errno %d). If you are not out of available memory, you can consult the manual for a possible OS-dependent bug",
 "Column count doesn't match value count at row %ld",

sql/sql_acl.cc

@@ -1203,8 +1203,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
 				  (byte*) table->field[0]->ptr,0,
 				  HA_READ_KEY_EXACT))
   {
-    my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT),
-                   MYF(0),user,host);
+    my_error(ER_PASSWORD_NO_MATCH,MYF(0));	/* purecov: deadcode */
     DBUG_RETURN(1);				/* purecov: deadcode */
   }
   store_record(table,1);
@@ -1446,8 +1445,7 @@ static int replace_db_table(TABLE *table, const char *db,
   // is there such a user in user table in memory ????
   if (!initialized || !find_acl_user(combo.host.str,combo.user.str))
   {
-    my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT),MYF(0),
-                   combo.user.str,combo.host.str);
+    my_error(ER_PASSWORD_NO_MATCH,MYF(0));
     DBUG_RETURN(-1);
   }
 
@@ -1890,8 +1888,6 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
   if (!find_acl_user(combo.host.str,combo.user.str))
   {
     my_error(ER_PASSWORD_NO_MATCH,MYF(0));	/* purecov: deadcode */
-    my_printf_error(ER_NONEXISTING_GRANT,ER(ER_NONEXISTING_GRANT),MYF(0),
-                   combo.user.str,combo.host.str);
     DBUG_RETURN(-1);				/* purecov: deadcode */
   }