Commit 0c7ac260 authored by unknown's avatar unknown
Browse files

sql_acl.cc: 

  Correcting problem with merge


sql/sql_acl.cc:
  Correcting problem with merge
parent 6ffd23d6

sql/sql_acl.cc

+8 −7
Original line number Diff line number Diff line
@@ -3683,6 +3683,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list) 
	    result= -1;

	  }

	  else

	  {

	    if (!grant_table->cols)

	    {

	      revoked= 1;