diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
| commit | d38e7d6676a144f1f41fb15c0f7e9860593e7ccb (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /sql/sql_acl.cc | |
| parent | 3a0d42c6c692f303b372d4effd237ec93779aeaa (diff) | |
| parent | 1fa37ae427bc351530f7fcfd6050d1b1cdd0167b (diff) | |
| download | mariadb-git-d38e7d6676a144f1f41fb15c0f7e9860593e7ccb.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 27cf9ec3441..89b70032642 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1974,13 +1974,12 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, */ else if (!password_len && no_auto_create) { - my_error(ER_PASSWORD_NO_MATCH, MYF(0), combo.user.str, combo.host.str); + my_error(ER_PASSWORD_NO_MATCH, MYF(0)); goto end; } else if (!can_create_user) { - my_error(ER_CANT_CREATE_USER_WITH_GRANT, MYF(0), - thd->security_ctx->user, thd->security_ctx->host_or_ip); + my_error(ER_CANT_CREATE_USER_WITH_GRANT, MYF(0)); goto end; } old_row_exists = 0; |