Commit 2a32eaf8 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0 

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0
parents d2b4eb3e c5d95b5e

configure.in

+12 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,18 @@ AC_ARG_WITH(embedded-server, 
    [with_embedded_server=no]

)



AC_ARG_WITH(query_cache,

    [  --without-query-cache  Don't build query cache in embedded server.],

    [with_embedded_server=$withval],

    [with_embedded_server=yes]

)



if test "$with_embedded_server" = "yes"

then

    CFLAGS="$CFLAGS -DHAVE_QUERY_CACHE"

    CXXFLAGS="$CXXFLAGS -DHAVE_QUERY_CACHE"

fi



AC_ARG_WITH(extra-tools,

    [  --without-extra-tools   Skip building utilites in the tools directory.],

    [with_tools=$withval],

include/my_global.h

+8 −0
Original line number Diff line number Diff line
@@ -1023,4 +1023,12 @@ 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

*/

#ifdef MYSQL_SERVER

#define HAVE_QUERY_CACHE

#endif



#endif /* _global_h */

mysql-test/include/have_query_cache.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_query_cache.require

disable_query_log;

show variables like "have_query_cache";

enable_query_log;

mysql-test/r/flush.result

+0 −5
Original line number Diff line number Diff line
@@ -28,8 +28,3 @@ select * from t1; 
n

345

drop table t1;
 
flush query cache;

reset query cache;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/r/have_query_cache.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

have_query_cache	YES