Commit 490a40d6 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
parents 1fe93cea 2cb46a24

sql/sql_parse.cc

+10 −1
Original line number Diff line number Diff line
@@ -2571,8 +2571,17 @@ check_table_access(THD *thd,uint want_access,TABLE_LIST *tables, 
      }

    }

    else if (check_access(thd,want_access,tables->db,&tables->grant.privilege,

			  0, no_errors | grant_option))

    {

      if (grant_option) 

      {

	if ( check_access(thd,want_access & (uint) ~TABLE_ACLS,tables->db,&tables->grant.privilege,

			  0, no_errors))

      return TRUE;				// Access denied

	return TRUE;			

      }

      else

	return TRUE;

    }

  }

  if (grant_option)

    return check_grant(thd,want_access & ~EXTRA_ACL,org_tables,