diff options
| author | bell@sanja.is.com.ua <> | 2004-04-07 13:25:24 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-04-07 13:25:24 +0300 |
| commit | 560a9f66d3ea7ad13d65256129c0a69a33c6f5ac (patch) | |
| tree | dece9888fe1343e2984889cfef41a8d06855dee7 /sql/sql_base.cc | |
| parent | 75e7ca479e52e14358df0b70c35e6c604c6bca72 (diff) | |
| download | mariadb-git-560a9f66d3ea7ad13d65256129c0a69a33c6f5ac.tar.gz | |
after review changes
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f70feb8dc9c..0862de073d3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -156,7 +156,7 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) table_list.db= (char*) entry->table_cache_key; table_list.real_name= entry->real_name; table_list.grant.privilege=0; - table_list.non_cachable_table= 1; // just safety for table on stack + if (check_table_access(thd,SELECT_ACL | EXTRA_ACL,&table_list,1)) continue; /* need to check if we haven't already listed it */ @@ -1333,7 +1333,7 @@ static int open_unireg_entry(THD *thd, TABLE *entry, const char *db, bzero((char*) &table_list, sizeof(table_list)); // just for safe table_list.db=(char*) db; table_list.real_name=(char*) name; - table_list.non_cachable_table= 1; // just safety for table on stack + safe_mutex_assert_owner(&LOCK_open); if ((error=lock_table_name(thd,&table_list))) @@ -1941,7 +1941,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, if (find) { (*where)= item->cached_table= tables; - if (tables->non_cachable_table) + if (!tables->cacheable_table) item->cached_table= 0; if (find == WRONG_GRANT) return (Field*) 0; @@ -2002,7 +2002,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, if (field == WRONG_GRANT) return (Field*) 0; (*where)= item->cached_table= tables; - if (tables->non_cachable_table) + if (!tables->cacheable_table) item->cached_table= 0; if (found) { |