diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-21 20:55:37 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-21 20:55:37 +0200 |
| commit | 2da92ead65f1bf6189e556d42fe9a11108ef343e (patch) | |
| tree | 9396a2750231f593b88b423264adf6f3b7ba6af9 /sql/sql_acl.cc | |
| parent | a1c0a4b45d5d60322e8615ae7407e90cfcebb576 (diff) | |
| parent | 8ddf61d382cf98ab8adc23c04c0aced95bc4f4ef (diff) | |
| download | mariadb-git-2da92ead65f1bf6189e556d42fe9a11108ef343e.tar.gz | |
Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
configure.in:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysys/charset-def.c:
Auto merged
mysys/charset.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype.c:
Auto merged
mysql-test/r/innodb.result:
Manual merge
mysql-test/r/multi_update.result:
Manual merge
mysql-test/t/multi_update.test:
Manual merge
sql/sql_update.cc:
SCCS merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 1b57e9363e4..dfdd6f5c5b4 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5539,6 +5539,12 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list) VOID(pthread_mutex_unlock(&acl_cache->lock)); + if (result) + my_error(ER_CANNOT_USER, MYF(0), "DROP USER", wrong_users.c_ptr_safe()); + + DBUG_PRINT("info", ("thd->net.last_errno: %d", thd->net.last_errno)); + DBUG_PRINT("info", ("thd->net.last_error: %s", thd->net.last_error)); + if (mysql_bin_log.is_open()) { thd->binlog_query(THD::MYSQL_QUERY_TYPE, @@ -5547,8 +5553,6 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list) rw_unlock(&LOCK_grant); close_thread_tables(thd); - if (result) - my_error(ER_CANNOT_USER, MYF(0), "DROP USER", wrong_users.c_ptr_safe()); DBUG_RETURN(result); } |