Commit 2e2b146b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix for HAVE_QUERY_CACHE 

Remove not used flag CLIENT_CHANGE_USER
parent d80ebc17

Docs/manual.texi

+10 −4
Original line number Diff line number Diff line
@@ -33543,8 +33543,10 @@ If you want to use an @code{ORDER BY} for the total @code{UNION} result, 
you should use parentheses:















@example













(SELECT a FROM table_name WHERE a=10 AND B=1 ORDER BY a LIMIT 10) UNION













(SELECT a FROM table_name WHERE a=11 AND B=2 ORDER BY a LIMIT 10) ORDER BY a;













(SELECT a FROM table_name WHERE a=10 AND B=1 ORDER BY a LIMIT 10)













UNION













(SELECT a FROM table_name WHERE a=11 AND B=2 ORDER BY a LIMIT 10)













ORDER BY a;















@end example





























@findex HANDLER









@@ -33553,8 +33555,12 @@ you should use parentheses:



























@example















HANDLER table OPEN [ AS alias ]













HANDLER table READ index @{ = | >= | <= | < @} (value1, value2, ... )  [ WHERE ... ] [LIMIT ... ]













HANDLER table READ index @{ FIRST | NEXT | PREV | LAST @} [ WHERE ... ] [LIMIT ... ]













HANDLER table READ index @{ = | >= | <= | < @} (value1, value2, ... )













[ WHERE ... ] [LIMIT ... ]

























HANDLER table READ index @{ FIRST | NEXT | PREV | LAST @}













[ WHERE ... ] [LIMIT ... ]



























HANDLER table READ @{ FIRST | NEXT @}  [ WHERE ... ] [LIMIT ... ]















HANDLER table CLOSE















@end example

























acconfig.h



+3
−0






























Original line number
Diff line number
Diff line








@@ -148,6 +148,9 @@













/* crypt */















#undef HAVE_CRYPT





























/* If we want to have query cache */













#undef HAVE_QUERY_CACHE





























/* Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines















   this with 8 arguments */















#undef HAVE_SOLARIS_STYLE_GETHOST

































configure.in



+5
−6






























Original line number
Diff line number
Diff line








@@ -1827,15 +1827,14 @@ AC_ARG_WITH(embedded-server,













)































AC_ARG_WITH(query_cache,













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













    [with_embedded_server=$withval],













    [with_embedded_server=yes]













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













    [with_query_cache=$withval],













    [with_query_cache=yes]















)





























if test "$with_embedded_server" = "yes"













if test "$with_query_cache" = "yes"















then













    CFLAGS="$CFLAGS -DHAVE_QUERY_CACHE"













    CXXFLAGS="$CXXFLAGS -DHAVE_QUERY_CACHE"













  AC_DEFINE(HAVE_QUERY_CACHE)















fi































AC_ARG_WITH(extra-tools,

































include/my_global.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -1027,7 +1027,7 @@ typedef union {













   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













#if defined(MYSQL_SERVER) && !defined(HAVE_QUERY_CACHE)















#define HAVE_QUERY_CACHE















#endif

















































include/mysql_com.h



+0
−1






























Original line number
Diff line number
Diff line








@@ -91,7 +91,6 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,













#define CLIENT_ODBC		64	/* Odbc client */















#define CLIENT_LOCAL_FILES	128	/* Can use LOAD DATA LOCAL */















#define CLIENT_IGNORE_SPACE	256	/* Ignore spaces before '(' */













#define CLIENT_CHANGE_USER	512	/* Support the mysql_change_user() */















#define CLIENT_INTERACTIVE	1024	/* This is an interactive client */















#define CLIENT_SSL              2048     /* Switch to SSL after handshake */















#define CLIENT_IGNORE_SIGPIPE   4096     /* IGNORE sigpipes */