diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-10 00:08:24 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-10 00:08:24 +0200 |
| commit | f939a6b635846216778bb4abd96ba6fef229908e (patch) | |
| tree | 3e69c63ee516f0cf84e4f42523b616db0f833200 /sql/sql_cache.h | |
| parent | b05520526e75ea6fbe17aad0c256851bccd33054 (diff) | |
| download | mariadb-git-f939a6b635846216778bb4abd96ba6fef229908e.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.
Docs/manual.texi:
Update of query cache info.
Docs/section.Comparisons.texi:
Added indexing.
client/mysqlbinlog.cc:
Removed compiler warnings.
client/mysqltest.c:
Added enable_result_log/disable_result_log
include/config-win.h:
Added support of semaphores on Windows.
include/my_pthread.h:
Added pthread_mutex_trylock for windows.
include/my_sys.h:
Cleanup
libmysql/libmysql.c:
Fixed bug in mysql_use_result() (When reusing connections).
myisam/ft_boolean_search.c:
Removed compiler warnings
myisam/ft_nlq_search.c:
Removed compiler warnings
myisam/ft_update.c:
Removed compiler warnings
mysql-test/r/query_cache.result:
New tests
mysql-test/t/query_cache-master.opt:
New tests
mysql-test/t/query_cache.test:
New tests
mysys/Makefile.am:
Added new operators to be used with gcc 3.0.x
sql/filesort.cc:
Removed compiler warnings
sql/item_func.cc:
Removed compiler warnings
sql/mysql_priv.h:
Removed compiler warnings
sql/mysqld.cc:
Update of query cache code.
sql/slave.cc:
Removed compiler warnings.
Code cleanup (Indentation)
sql/sql_cache.cc:
Updated code
sql/sql_cache.h:
Updated code
sql/sql_repl.cc:
Removed compiler warnings
sql/sql_yacc.yy:
Updated query cache
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: /* |