diff options
| author | monty@hundin.mysql.fi <> | 2001-12-10 00:08:24 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-10 00:08:24 +0200 |
| commit | 6b02f13cf3f0b4757398ef8e6915eacb8bfe70a0 (patch) | |
| tree | 3e69c63ee516f0cf84e4f42523b616db0f833200 /sql/sql_cache.h | |
| parent | a1f9987bff24b42881f8bf0e2fdc4a13930c7273 (diff) | |
| download | mariadb-git-6b02f13cf3f0b4757398ef8e6915eacb8bfe70a0.tar.gz | |
Removed compiler warnings.
Added new operators to be used with gcc 3.0.x
Update of query cache code.
Added semaphores for Windows (not yet in use)
Added pthread_mutex_trylock for windows.
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index f5f0580d051..c01ea1e21d4 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -17,8 +17,6 @@ #ifndef _SQL_CACHE_H #define _SQL_CACHE_H -#include <semaphore.h> - /* Query cache */ /* @@ -105,7 +103,7 @@ struct Query_cache_query Query_cache_block *res; NET *wri; ulong len; - sem_t lock; // R/W lock of block + pthread_cond_t lock; // R/W lock of block pthread_mutex_t clients_guard; uint clients; @@ -220,7 +218,8 @@ public: /* Info */ ulong query_cache_size, query_cache_limit; /* statistics */ - ulong free_memory, queries_in_cache, hits, inserts, refused; + ulong free_memory, queries_in_cache, hits, inserts, refused, + free_memory_blocks, total_blocks; protected: /* |