diff options
| author | unknown <monty@mysql.com> | 2004-05-06 11:42:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-06 11:42:35 +0300 |
| commit | 2d776e36d8dd205efccc18a75292308fd4c5d385 (patch) | |
| tree | 535e4915e68ef681625b249ce2ced41bf183d77c /sql/sql_acl.cc | |
| parent | 33359d0b66b19e1fef71ead79f8319ef00148181 (diff) | |
| parent | 3a4d315fa1fba3dbd06f9ff7ba7f2d65da7d3d2a (diff) | |
| download | mariadb-git-2d776e36d8dd205efccc18a75292308fd4c5d385.tar.gz | |
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
sql/sql_acl.cc:
Auto merged
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)) |