Fix for HAVE_QUERY_CACHE

Remove not used flag CLIENT_CHANGE_USER


Docs/manual.texi:
  Cleanup examples
acconfig.h:
  Fix for HAVE_QUERY_CACHE
configure.in:
  Fix for HAVE_QUERY_CACHE
include/my_global.h:
  Fix for HAVE_QUERY_CACHE
include/mysql_com.h:
  Remove not used flag CLIENT_CHANGE_USER
libmysqld/libmysqld.c:
  Fix new prototypes

6 files changed, 26 insertions, 19 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 8bfd6aca44e..a77e50b794d 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -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
diff --git a/acconfig.h b/acconfig.h
index 02be1ace0c6..f52c38b2fdc 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -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
diff --git a/configure.in b/configure.in
index 17edcabbaf0..a0e6b819367 100644
--- a/configure.in
+++ b/configure.in
@@ -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,
diff --git a/include/my_global.h b/include/my_global.h
index 2c9f16aca59..2b5c6915ad9 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -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
 
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 269fc665b07..0e54c0e992b 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -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 */
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 82928434cc6..59e6239c1e7 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -1719,7 +1719,7 @@ mysql_dump_debug_info(MYSQL *mysql)
   DBUG_RETURN(simple_command(mysql,COM_DEBUG,"",0,0));
 }
 
-char * STDCALL
+const char * STDCALL
 mysql_stat(MYSQL *mysql)
 {
   DBUG_ENTER("mysql_stat");
@@ -1744,14 +1744,14 @@ mysql_ping(MYSQL *mysql)
 }
 
 
-char * STDCALL
+const char * STDCALL
 mysql_get_server_info(MYSQL *mysql)
 {
   return((char*) mysql->server_version);
 }
 
 
-char * STDCALL
+const char * STDCALL
 mysql_get_host_info(MYSQL *mysql)
 {
   return(mysql->host_info);
@@ -1764,10 +1764,10 @@ mysql_get_proto_info(MYSQL *mysql)
   return (mysql->protocol_version);
 }
 
-char * STDCALL
+const char * STDCALL
 mysql_get_client_info(void)
 {
-  return (char*) MYSQL_SERVER_VERSION;
+  return MYSQL_SERVER_VERSION;
 }
 
 
@@ -1875,12 +1875,12 @@ uint STDCALL mysql_errno(MYSQL *mysql)
   return (mysql)->net.last_errno;
 }
 
-char * STDCALL mysql_error(MYSQL *mysql)
+const char * STDCALL mysql_error(MYSQL *mysql)
 {
   return (mysql)->net.last_error;
 }
 
-char *STDCALL mysql_info(MYSQL *mysql)
+const char *STDCALL mysql_info(MYSQL *mysql)
 {
   return (mysql)->info;
 }