summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-06-07 00:31:53 +0300
committermonty@mysql.com <>2005-06-07 00:31:53 +0300
commit775f17667be97bc76a25324e8a99e72ae445e223 (patch)
tree1a560cda860f9d9f422087da93fcdc67cd9f66d0 /sql/protocol.cc
parent8c94b5fba7f6e5518616615da63c8029c5790aea (diff)
parentabb2d7aa347c0d12ad40fc04315167d3274baae0 (diff)
downloadmariadb-git-775f17667be97bc76a25324e8a99e72ae445e223.tar.gz
Merge with 4.1
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 8019f3a123b..57922cdc677 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -19,8 +19,6 @@
The actual communction is handled by the net_xxx functions in net_serv.cc
*/
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif