diff options
| author | unknown <thek@adventure.(none)> | 2008-03-10 16:46:38 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-03-10 16:46:38 +0100 |
| commit | 269ccba9e782877f65e940cc6a390e6d9686ae1e (patch) | |
| tree | 44112389a3d868836f09028d870de0ab2043af9e /sql/sql_cache.cc | |
| parent | eea48abc777b98bc06699fa4593aff2a71751e79 (diff) | |
| parent | c184cd6320ac3b5cbd1ab953d94ea1ef8c4d200e (diff) | |
| download | mariadb-git-269ccba9e782877f65e940cc6a390e6d9686ae1e.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug25132/my50-bug25132
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/sql_cache.cc:
Auto merged
mysql-test/r/query_cache.result:
Manual merge
mysql-test/t/query_cache.test:
Manual merge
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index ae6765c7934..388700f0efa 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1998,6 +1998,7 @@ void Query_cache::make_disabled() query_cache_size= 0; queries_blocks= 0; free_memory= 0; + free_memory_blocks= 0; bins= 0; steps= 0; cache= 0; |