bk commit into 5.0 tree (svoj:1.1901)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 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.1901 05/09/02 01:45:40 svoj@stripped +4 -0
  WL#2763 - MySQL plugin interface: step 1
  "max" compilation fixes.

  sql/table.cc
    1.178 05/09/02 01:45:36 svoj@stripped +2 -0
    Call plugin_find only if HAVE_DLOPEN is defined.

  sql/sql_plugin.h
    1.5 05/09/02 01:45:36 svoj@stripped +4 -2
    Pass plugin structures even if HAVE_DLOPEN wasn't defined. It allows them to be
    used with internal (static) plugins.
    Functions are not yet passed. They must be rewritten.

  sql/mysqld.cc
    1.487 05/09/02 01:45:36 svoj@stripped +2 -0
    Set opt_plugin_dir only if HAVE_DLOPEN is defined.

  libmysqld/Makefile.am
    1.62 05/09/02 01:45:36 svoj@stripped +3 -1
    Pass LIBDIR to embedded library.

# 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:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/CNET/mysql-5.0

--- 1.486/sql/mysqld.cc	2005-08-20 20:40:38 +05:00
+++ 1.487/sql/mysqld.cc	2005-09-02 01:45:36 +05:00
@@ -6046,7 +6046,9 @@
 	  sizeof(mysql_real_data_home)-1);
   mysql_data_home_buff[0]=FN_CURLIB;	// all paths are relative from here
   mysql_data_home_buff[1]=0;
+#ifdef HAVE_DLOPEN
   opt_plugin_dir= get_relative_path(LIBDIR);
+#endif
 
   /* Replication parameters */
   master_user= (char*) "test";

--- 1.177/sql/table.cc	2005-09-01 22:22:47 +05:00
+++ 1.178/sql/table.cc	2005-09-02 01:45:36 +05:00
@@ -368,7 +368,9 @@
         }
         parser_name.str= next_chunk;
         parser_name.length= strlen(next_chunk);
+#ifdef HAVE_DLOPEN
         keyinfo->parser= plugin_find(&parser_name, MYSQL_PLUGIN_TYPE_FTPARSER);
+#endif
         if (! keyinfo->parser)
         {
           my_free(buff, MYF(0));

--- 1.61/libmysqld/Makefile.am	2005-07-06 02:56:19 +05:00
+++ 1.62/libmysqld/Makefile.am	2005-09-02 01:45:36 +05:00
@@ -20,11 +20,13 @@
 MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
+MYSQLLIBdir=            $(libdir)
 
 DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
-			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
+			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+			-DLIBDIR="\"$(MYSQLLIBdir)\""
 INCLUDES=		@bdb_includes@ \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \

--- 1.4/sql/sql_plugin.h	2005-09-01 22:22:47 +05:00
+++ 1.5/sql/sql_plugin.h	2005-09-02 01:45:36 +05:00
@@ -14,8 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#if !defined(_plugin_h) && defined(HAVE_DLOPEN)
-#define _plugin_h
+#ifndef _sql_plugin_h
+#define _sql_plugin_h
 #include <plugin.h>
 struct st_plugin_dl
 {
@@ -33,8 +33,10 @@
   struct st_plugin_dl *plugin_dl;
 };
 
+#ifdef HAVE_DLOPEN
 extern char *opt_plugin_dir;
 extern void plugin_init(void);
 extern void plugin_free(void);
 extern st_plugin_int *plugin_find(LEX_STRING *name, int type);
+#endif
 #endif