summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.cc
diff options
context:
space:
mode:
authorndbdev@dl145b.mysql.com <>2005-06-07 06:50:50 +0200
committerndbdev@dl145b.mysql.com <>2005-06-07 06:50:50 +0200
commit2fb1fb587795111b531b13f7c8ad8a2f2a586880 (patch)
tree4893ccd0f289c817a66251a5136b70608405ece2 /sql/ha_myisam.cc
parent161a58ab4b3ef4fbd676fcaa7aa355e47b710288 (diff)
parentab96501e4cb43985bf177a2e7a5cb1c72dff4a99 (diff)
downloadmariadb-git-2fb1fb587795111b531b13f7c8ad8a2f2a586880.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r--sql/ha_myisam.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index f66aa025b86..3f756eab0ee 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -15,8 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif