mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

query cache code can be excluded from server

Browse source 
sql/mysqld.cc:
  fake query_cache_size parameter if query cache code excluded from server
This commit is contained in:
unknown 2002-04-15 16:00:05 +03:00
commit 02ebecfc23
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BUILD/compile-pentium-debug
View file

@ -6,7 +6,7 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs $static_link"
extra_configs="$pentium_configs $debug_configs $static_link --without-query-cache"
extra_configs="$extra_configs "

4
Docs/manual.texi
View file

@ -36325,6 +36325,8 @@ Following are some performance data for the query cache
@item
If you want to disable the query cache code set @code{query_cache_size=0}.
By disabling the query cache code there is no noticeable overhead.
(query cache can be excluded from code with help of configure option
@code{--without-query-cache})
@item
If all of the queries you're preforming are simple (such as selecting a
row from a table with one row); but still differ so that the queries can
@ -48918,6 +48920,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
New configure option --without-query-cache.
@item
Memory allocation strategy for 'root memory' changed. Block size now grows
with number of allocated blocks.
@item

2
configure.in
View file

@ -1823,7 +1823,7 @@ AC_ARG_WITH(embedded-server,
)
AC_ARG_WITH(query_cache,
[ --without-query-cache Don not build query cache in embedded server.],
[ --without-query-cache Do not build query cache.],
[with_query_cache=$withval],
[with_query_cache=yes]
)

8
include/my_global.h
View file

@ -1023,12 +1023,4 @@ typedef union {
#define C_MODE_END
#endif
/*
Now if query is taken off then tests with query cache fails
SANJA TODO: remove this when problem with mysql-test will be solved
*/
#if defined(MYSQL_SERVER) && !defined(HAVE_QUERY_CACHE)
#define HAVE_QUERY_CACHE
#endif
#endif /* _global_h */

1
mysql-test/t/innodb_cache.test
View file

@ -1,4 +1,5 @@
-- source include/have_innodb.inc
-- source include/have_query_cache.inc
#
# Without auto_commit.

5
sql/mysqld.cc
View file

@ -291,8 +291,9 @@ ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size,
ulong com_stat[(uint) SQLCOM_END], com_other;
ulong slave_net_timeout;
ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0;
ulong query_cache_size=0;
#ifdef HAVE_QUERY_CACHE
ulong query_cache_size=0, query_cache_limit=0, query_cache_startup_type=1;
ulong query_cache_limit=0, query_cache_startup_type=1;
Query_cache query_cache;
#endif
@ -3048,8 +3049,10 @@ CHANGEABLE_VAR changeable_vars[] = {
#ifdef HAVE_QUERY_CACHE
{ "query_cache_limit", (long*) &query_cache_limit,
1024*1024L, 0, ULONG_MAX, 0, 1},
#endif /*HAVE_QUERY_CACHE*/
{ "query_cache_size", (long*) &query_cache_size,
0, 0, ULONG_MAX, 0, 1},
#ifdef HAVE_QUERY_CACHE
{ "query_cache_startup_type",(long*) &query_cache_startup_type,
1, 0, 2, 0, 1},
#endif /*HAVE_QUERY_CACHE*/