Commit 2d776e36 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 


sql/sql_acl.cc:
  Auto merged
parents 33359d0b 3a4d315f

sql/sql_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -2655,7 +2655,7 @@ bool check_grant_column(THD *thd,TABLE *table, const char *name, 
  if (table->grant.version != grant_version)

  {

    table->grant.grant_table=

      table_hash_search(thd->host,thd->ip,thd->db,

      table_hash_search(thd->host, thd->ip, table->table_cache_key,

			thd->priv_user,

			table->real_name, 0);	/* purecov: inspected */

    table->grant.version=grant_version;		/* purecov: inspected */