Merge arjen@work.mysql.com:/home/bk/mysql-4.0

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0
This commit is contained in:
unknown 2001-12-13 12:01:12 +10:00
commit f6ff0c4916

View File

@ -34738,6 +34738,7 @@ If this is 0, the query cache is disabled (default).
@item @code{query_cache_startup_type} @item @code{query_cache_startup_type}
This may be set (only numeric) to This may be set (only numeric) to
@multitable @columnfractions .3 .7 @multitable @columnfractions .3 .7
@item @strong{Option} @tab @strong{Description}
@item 0 @tab (OFF, don't cache or retrieve results) @item 0 @tab (OFF, don't cache or retrieve results)
@item 1 @tab (ON, cache all results except @code{SELECT SQL_NO_CACHE ...} queries) @item 1 @tab (ON, cache all results except @code{SELECT SQL_NO_CACHE ...} queries)
@item 2 @tab (DEMAND, cache only @code{SELECT SQL_CACHE ...} queries) @item 2 @tab (DEMAND, cache only @code{SELECT SQL_CACHE ...} queries)
@ -34771,16 +34772,15 @@ specified in a @code{SELECT} query:
@findex SQL_CACHE @findex SQL_CACHE
@findex SQL_NO_CACHE @findex SQL_NO_CACHE
@itemize @multitable @columnfractions .3 .7
@item @strong{Option} @tab @strong{Description}
@item @code{SQL_CACHE} @item @code{SQL_CACHE}
If @code{SQL_QUERY_CACHE_TYPE} is @code{DEMAND}, @tab If @code{SQL_QUERY_CACHE_TYPE} is @code{DEMAND}, allow the query to be cached.
allow the query to be cached.
If @code{SQL_QUERY_CACHE_TYPE} is @code{ON}, this is the default. If @code{SQL_QUERY_CACHE_TYPE} is @code{ON}, this is the default.
If @code{SQL_QUERY_CACHE_TYPE} is @code{OFF}, do nothing. If @code{SQL_QUERY_CACHE_TYPE} is @code{OFF}, do nothing.
@item @code{SQL_NO_CACHE} @item @code{SQL_NO_CACHE}
Make this query non-cachable, don't allow this query to be stored @tab Make this query non-cachable, don't allow this query to be stored in the cache.
in the cache. @end multitable
@end itemize
@node Query Cache Status and Maintenance, , Query Cache in SELECT, Query Cache @node Query Cache Status and Maintenance, , Query Cache in SELECT, Query Cache
@ -34796,19 +34796,20 @@ query cache.
You can monitor query cache performance in @code{SHOW STATUS}: You can monitor query cache performance in @code{SHOW STATUS}:
@itemize @multitable @columnfractions .3 .7
@item @strong{Variable} @tab @strong{Description}
@item @code{Qcache_queries_in_cache} @item @code{Qcache_queries_in_cache}
Number of queries registered in the cache. @tab Number of queries registered in the cache.
@item @code{Qcache_inserts} @item @code{Qcache_inserts}
Number of queries added to the cache. @tab Number of queries added to the cache.
@item @code{Qcache_hits} @item @code{Qcache_hits}
Number of cache hits @tab Number of cache hits
@item @code{Qcache_not_cached} @item @code{Qcache_not_cached}
Number of non-cached queries @tab Number of non-cached queries
(not cachable, or due to SQL_QUERY_CACHE_TYPE) (not cachable, or due to SQL_QUERY_CACHE_TYPE)
@item @code{Qcache_free_memory} @item @code{Qcache_free_memory}
Amount of free memory for query cache. @tab Amount of free memory for query cache.
@end itemize @end multitable
Please note: Please note:
Total number of queries = Total number of queries =