database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

Browse Source 
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)
This commit is contained in:
unknown
2003-02-19 16:16:27 +01:00
parent f4d93af14d
commit 5fae3c25e2
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_acl.cc
View File

@@ -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 */
}