diff options
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 9c2eb9feb69..0b2d4ad76e8 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1182,12 +1182,13 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, password=empty_string; empty_string[0]=0; + if (combo.password.str && combo.password.str[0]) { if (combo.password.length != HASH_PASSWORD_LENGTH) { - send_error(&thd->net, ER_PASSWORD_NO_MATCH); - DBUG_RETURN(1); + my_error(ER_PASSWORD_NO_MATCH,MYF(0)); + DBUG_RETURN(-1); } password=combo.password.str; } |