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

8 files changed, 7 insertions, 7 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
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index 11b0822f3f8..8f84793c1e5 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 long number_of_calls= 0; /* for SHOW STATUS, see below */
 
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h
index ce06334ffd7..52bfc44496b 100644
--- a/sql/sql_plugin.h
+++ b/sql/sql_plugin.h
@@ -24,7 +24,7 @@
 #define SHOW_FUNC    SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \
                      SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE,   \
                      SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH
-#include <plugin.h>
+#include <mysql/plugin.h>
 #undef SHOW_FUNC
 typedef enum enum_mysql_show_type SHOW_TYPE;
 typedef struct st_mysql_show_var SHOW_VAR;
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index bc228d5c767..3425a8735c7 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -51,7 +51,7 @@ TODO:
 #include "ha_tina.h"
 #include <sys/mman.h>
 
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 /* Stuff for shares */
 pthread_mutex_t tina_mutex;
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 0e9dcf231d9..dff36e10b1a 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -70,7 +70,7 @@
 #include "mysql_priv.h"
 #include "ha_example.h"
 
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 static handler* example_create_handler(TABLE_SHARE *table);
 static int example_init_func();
diff --git a/storage/myisam/ftdefs.h b/storage/myisam/ftdefs.h
index 800b911b425..175f34df102 100644
--- a/storage/myisam/ftdefs.h
+++ b/storage/myisam/ftdefs.h
@@ -22,7 +22,7 @@
 #include <m_ctype.h>
 #include <my_tree.h>
 #include <queues.h>
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 #define true_word_char(s,X)	(my_isalnum(s,X) || (X)=='_')
 #define misc_word_char(X)	0