From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 25 Apr 2011 17:22:25 +0200
Subject: lots of post-merge changes

---
 sql/net_serv.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'sql/net_serv.cc')

diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index a2f17075ea6..5f7f0b25fc1 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -85,19 +85,14 @@ void sql_print_error(const char *format,...);
 */
 extern uint test_flags;
 extern ulong bytes_sent, bytes_received, net_big_packet_count;
-#ifndef MYSQL_INSTANCE_MANAGER
 #ifdef HAVE_QUERY_CACHE
 #define USE_QUERY_CACHE
 extern void query_cache_insert(const char *packet, ulong length,
                                unsigned pkt_nr);
 #endif // HAVE_QUERY_CACHE
 #define update_statistics(A) A
-#endif /* MYSQL_INSTANCE_MANGER */
-#endif /* defined(MYSQL_SERVER) && !defined(MYSQL_INSTANCE_MANAGER) */
-
-#if !defined(MYSQL_SERVER) || defined(MYSQL_INSTANCE_MANAGER)
+#else
 #define update_statistics(A)
-#define thd_increment_bytes_sent(N)
 #endif
 
 #define TEST_BLOCKING		8
-- 
cgit v1.2.1