diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
| commit | 74e3399af186b3159738c0c9c55672f0dbd7705c (patch) | |
| tree | cc7389163da24340a03858b997927a41eeedc545 /sql/net_serv.cc | |
| parent | 4e09f14b18ededb18aab527abe582fca34afe79c (diff) | |
| parent | 1c50f8ac7894e7a59e25f720ab700cbe73986347 (diff) | |
| download | mariadb-git-74e3399af186b3159738c0c9c55672f0dbd7705c.tar.gz | |
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
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index eac197e530b..7944a528b83 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -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 |