summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-01-16 01:08:29 +0200
committerunknown <monty@hundin.mysql.fi>2002-01-16 01:08:29 +0200
commitecca655e2a949f4a26b5977b31054208fbf43abd (patch)
tree04255ad8dbcf3e3e29807adb609c4e3e4da328eb /sql/handler.cc
parent88f3cdf94b11df7c302c47db491d349aea57d8a8 (diff)
parent1079b85fa120577379d32e6134be1b651a6b9c30 (diff)
downloadmariadb-git-ecca655e2a949f4a26b5977b31054208fbf43abd.tar.gz
merge
sql/mysqld.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index f097e501a8b..52d65edf0d4 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -33,7 +33,7 @@
#include "ha_berkeley.h"
#endif
#ifdef HAVE_INNOBASE_DB
-#include "ha_innobase.h"
+#include "ha_innodb.h"
#endif
#include <myisampack.h>
#include <errno.h>