summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/Makefile.am3
-rw-r--r--sql/sql_select.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 34cf21f9775..84198320522 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -47,7 +47,8 @@ mysqld_LDADD = libndb.la \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
-noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
+internalincludedir = $(pkgincludedir)/private
+internalinclude_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h \
item_xmlfunc.h sql_plugin_services.h \
item_create.h item_subselect.h item_row.h \
diff --git a/sql/sql_select.h b/sql/sql_select.h
index a5c0a797ed6..874ff959b1d 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -32,7 +32,7 @@
#include <myisam.h>
#if defined(WITH_ARIA_STORAGE_ENGINE) && defined(USE_MARIA_FOR_TMP_TABLES)
-#include "../storage/maria/ha_maria.h"
+#include <maria.h>
#define TMP_ENGINE_HTON maria_hton
#else
#define TMP_ENGINE_HTON myisam_hton