summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-02 14:10:04 +0300
commit8c95f3c53bb05e39b265660aa2197dac168038e0 (patch)
tree52d813ba1e4f0b538b1f175a1d157d865cce8a22 /sql/net_serv.cc
parent94e70aff6449748ac107c9445a8dd1e2aa36874f (diff)
parentb9014b95b4c298a1e275aa18f0e6b8df096d8a46 (diff)
downloadmariadb-git-8c95f3c53bb05e39b265660aa2197dac168038e0.tar.gz
Manual merge from mysql-next-mr.
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 4945ee8d94f..5cf3597c638 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -91,7 +91,6 @@ void sql_print_error(const char *format,...);
*/
extern uint test_flags;
extern ulong bytes_sent, bytes_received, net_big_packet_count;
-extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received;
#ifndef MYSQL_INSTANCE_MANAGER
#ifdef HAVE_QUERY_CACHE
#define USE_QUERY_CACHE