mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
merge
sql/item_strfunc.cc: Auto merged sql/lock.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted sql/net_serv.cc: Auto merged sql/sql_parse.cc: Auto merged
This commit is contained in:
@@ -88,10 +88,15 @@ void sql_print_error(const char *format,...);
|
||||
|
||||
#ifdef MYSQL_SERVER
|
||||
#define USE_QUERY_CACHE
|
||||
/*
|
||||
The following variables/functions should really not be declared
|
||||
extern, but as it's hard to include mysql_priv.h here, we have to
|
||||
live with this for a while.
|
||||
*/
|
||||
extern uint test_flags;
|
||||
extern void query_cache_insert(NET *net, const char *packet, ulong length);
|
||||
extern ulong bytes_sent, bytes_received, net_big_packet_count;
|
||||
extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
|
||||
extern void query_cache_insert(NET *net, const char *packet, ulong length);
|
||||
#else
|
||||
#undef statistic_add
|
||||
#undef statistic_increment
|
||||
|
Reference in New Issue
Block a user