diff options
| -rwxr-xr-x | BUILD/compile-pentium-debug | 2 | ||||
| -rw-r--r-- | Docs/manual.texi | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/my_global.h | 8 | ||||
| -rw-r--r-- | mysql-test/t/innodb_cache.test | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
6 files changed, 11 insertions, 11 deletions
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index d8a6b60809b..c8544e0dcec 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -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 " diff --git a/Docs/manual.texi b/Docs/manual.texi index 5445595ba8f..4b68b51d81c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -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 diff --git a/configure.in b/configure.in index 9649160393a..77a53a3c099 100644 --- a/configure.in +++ b/configure.in @@ -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] ) diff --git a/include/my_global.h b/include/my_global.h index 2b5c6915ad9..01910eb1342 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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 */ diff --git a/mysql-test/t/innodb_cache.test b/mysql-test/t/innodb_cache.test index 065671476a0..21d30420eaf 100644 --- a/mysql-test/t/innodb_cache.test +++ b/mysql-test/t/innodb_cache.test @@ -1,4 +1,5 @@ -- source include/have_innodb.inc +-- source include/have_query_cache.inc # # Without auto_commit. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 99f0a463a42..3fd58d6a03a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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*/ |