summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <svoj@april.(none)>2006-02-14 13:51:25 +0400
committerunknown <svoj@april.(none)>2006-02-14 13:51:25 +0400
commit9236e3c24bad0f213409baa81156b19407f1e597 (patch)
tree7d331337e1254783e7775856707c6045a9efe44e /include
parente98c80737f5f35b0e28fe29184abbd04f6f4b742 (diff)
downloadmariadb-git-9236e3c24bad0f213409baa81156b19407f1e597.tar.gz
BUG#17117: header fille "plugin.h" does not have a namespace prefix
plugin.h has been moved into include/mysql/plugin.h include/mysql/plugin.h: Rename: include/plugin.h -> include/mysql/plugin.h include/Makefile.am: plugin.h has been moved into include/mysql/plugin.h include/myisam.h: plugin.h has been moved into include/mysql/plugin.h plugin/fulltext/plugin_example.c: plugin.h has been moved into include/mysql/plugin.h sql/sql_plugin.h: plugin.h has been moved into include/mysql/plugin.h storage/csv/ha_tina.cc: plugin.h has been moved into include/mysql/plugin.h storage/example/ha_example.cc: plugin.h has been moved into include/mysql/plugin.h storage/myisam/ftdefs.h: plugin.h has been moved into include/mysql/plugin.h
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/myisam.h2
-rw-r--r--include/mysql/plugin.h (renamed from include/plugin.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 5b743baccb6..33e34fb512f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -22,7 +22,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
- mysql_time.h plugin.h $(BUILT_SOURCES)
+ mysql_time.h mysql/plugin.h $(BUILT_SOURCES)
noinst_HEADERS = config-win.h config-os2.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\
diff --git a/include/myisam.h b/include/myisam.h
index 4d55409b8b3..982982711f1 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -32,7 +32,7 @@ extern "C" {
#include "keycache.h"
#endif
#include "my_handler.h"
-#include <plugin.h>
+#include <mysql/plugin.h>
/*
There is a hard limit for the maximum number of keys as there are only
diff --git a/include/plugin.h b/include/mysql/plugin.h
index 06eb0e91366..06eb0e91366 100644
--- a/include/plugin.h
+++ b/include/mysql/plugin.h