diff options
| author | monty@mysql.com <> | 2004-05-06 11:42:35 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-06 11:42:35 +0300 |
| commit | f2991bc41007a8843b09f7e1b1d96061d2279b5d (patch) | |
| tree | 535e4915e68ef681625b249ce2ced41bf183d77c /sql/sql_acl.cc | |
| parent | a16c829c040d0202a2d35522787758fa8ef64aae (diff) | |
| parent | 2fd0a66591059539ef3f65beb5a5543e54c311d2 (diff) | |
| download | mariadb-git-f2991bc41007a8843b09f7e1b1d96061d2279b5d.tar.gz | |
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3b006d5d99f..6d2f662b7df 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2655,9 +2655,9 @@ 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->real_name, 0); /* purecov: inspected */ table->grant.version=grant_version; /* purecov: inspected */ } if (!(grant_table=table->grant.grant_table)) |