Commit e8da7ea0 authored by unknown's avatar unknown

Make query cache code independent of the MYSQL_SERVER define.

This fixes the query cache problem on windows.


sql/net_serv.cc:
  Make query cache code independent of the MYSQL_SERVER define.
parent e9b750d1
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
ulong max_allowed_packet=65536; ulong max_allowed_packet=65536;
extern ulong net_read_timeout,net_write_timeout; extern ulong net_read_timeout,net_write_timeout;
extern uint test_flags; extern uint test_flags;
#define USE_QUERY_CACHE
extern void query_cache_insert(NET *net, const char *packet, ulong length);
#else #else
ulong max_allowed_packet=16*1024*1024L; ulong max_allowed_packet=16*1024*1024L;
ulong net_read_timeout= NET_READ_TIMEOUT; ulong net_read_timeout= NET_READ_TIMEOUT;
...@@ -72,8 +74,6 @@ void sql_print_error(const char *format,...); ...@@ -72,8 +74,6 @@ void sql_print_error(const char *format,...);
extern ulong mysqld_net_retry_count; extern ulong mysqld_net_retry_count;
extern ulong bytes_sent, bytes_received; extern ulong bytes_sent, bytes_received;
extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received; extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
extern void query_cache_insert(NET *net, const char *packet, ulong length);
#else #else
#undef statistic_add #undef statistic_add
#define statistic_add(A,B,C) #define statistic_add(A,B,C)
...@@ -329,7 +329,7 @@ net_real_write(NET *net,const char *packet,ulong len) ...@@ -329,7 +329,7 @@ net_real_write(NET *net,const char *packet,ulong len)
my_bool net_blocking = vio_is_blocking(net->vio); my_bool net_blocking = vio_is_blocking(net->vio);
DBUG_ENTER("net_real_write"); DBUG_ENTER("net_real_write");
#ifdef MYSQL_SERVER #ifdef USE_QUERY_CACHE
if (net->query_cache_query != 0) if (net->query_cache_query != 0)
query_cache_insert(net, packet, len); query_cache_insert(net, packet, len);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment