bk commit into 5.1 tree (svoj:1.2100) BUG#17117

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2100 06/02/14 13:51:25 svoj@april.(none) +8 -0
  BUG#17117: header fille "plugin.h" does not have a namespace prefix
  plugin.h has been moved into include/mysql/plugin.h

  storage/myisam/ftdefs.h
    1.35 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  storage/example/ha_example.cc
    1.33 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  storage/csv/ha_tina.cc
    1.35 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  sql/sql_plugin.h
    1.6 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  plugin/fulltext/plugin_example.c
    1.7 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  include/myisam.h
    1.74 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  include/Makefile.am
    1.62 06/02/14 13:51:20 svoj@april.(none) +1 -1
    plugin.h has been moved into include/mysql/plugin.h

  include/mysql/plugin.h
    1.10 06/02/14 13:06:32 svoj@april.(none) +0 -0
    Rename: include/plugin.h -> include/mysql/plugin.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG17117/mysql-5.1-new

--- 1.61/include/Makefile.am	2006-02-02 09:56:55 +04:00
+++ 1.62/include/Makefile.am	2006-02-14 13:51:20 +04:00
@@ -22,7 +22,7 @@
 			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\

--- 1.73/include/myisam.h	2005-12-28 16:05:20 +04:00
+++ 1.74/include/myisam.h	2006-02-14 13:51:20 +04:00
@@ -32,7 +32,7 @@
 #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

--- 1.34/storage/myisam/ftdefs.h	2006-01-13 23:34:32 +04:00
+++ 1.35/storage/myisam/ftdefs.h	2006-02-14 13:51:20 +04:00
@@ -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

--- 1.34/storage/csv/ha_tina.cc	2006-02-08 10:42:52 +04:00
+++ 1.35/storage/csv/ha_tina.cc	2006-02-14 13:51:20 +04:00
@@ -51,7 +51,7 @@
 #include "ha_tina.h"
 #include <sys/mman.h>
 
-#include <plugin.h>
+#include <mysql/plugin.h>
 
 /* Stuff for shares */
 pthread_mutex_t tina_mutex;

--- 1.32/storage/example/ha_example.cc	2006-02-03 12:54:47 +04:00
+++ 1.33/storage/example/ha_example.cc	2006-02-14 13:51:20 +04:00
@@ -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();

--- 1.5/sql/sql_plugin.h	2006-01-07 17:41:42 +04:00
+++ 1.6/sql/sql_plugin.h	2006-02-14 13:51:20 +04:00
@@ -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;

--- 1.6/plugin/fulltext/plugin_example.c	2006-01-30 15:42:13 +04:00
+++ 1.7/plugin/fulltext/plugin_example.c	2006-02-14 13:51:20 +04:00
@@ -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 */