summaryrefslogtreecommitdiff
path: root/sql/procedure.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/procedure.cc
parent8c94b5fba7f6e5518616615da63c8029c5790aea (diff)
parentabb2d7aa347c0d12ad40fc04315167d3274baae0 (diff)
downloadmariadb-git-775f17667be97bc76a25324e8a99e72ae445e223.tar.gz
Merge with 4.1
Diffstat (limited to 'sql/procedure.cc')
-rw-r--r--sql/procedure.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/procedure.cc b/sql/procedure.cc
index 38a043300bc..554e2cd0565 100644
--- a/sql/procedure.cc
+++ b/sql/procedure.cc
@@ -17,8 +17,6 @@
/* Procedures (functions with changes output of select) */
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif