Manual merge 5.0->5.1

This commit is contained in:
Kristofer Pettersson 2008-08-06 16:20:41 +02:00
commit 857a0d6461
3 changed files with 26 additions and 13 deletions

View file

@ -5701,7 +5701,6 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
while ((tmp_user_name= user_list++))
{
user_name= get_current_user(thd, tmp_user_name);
if (!(user_name= get_current_user(thd, tmp_user_name)))
{
result= TRUE;