Commit 45256b35 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


include/mysql/plugin.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 0b2cb662 bfefdaf0

configure.in

+0 −4
Original line number Diff line number Diff line
@@ -2164,10 +2164,6 @@ MYSQL_CHECK_SSL 
# Has to be done late, as the plugin may need to check for existence of

# functions tested above

#--------------------------------------------------------------------

MYSQL_PLUGIN(ftexample,         [Simple Parser],

        [Simple full-text parser plugin])

MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])

MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])



MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],

        [MySQL Partitioning Support], [max,max-no-ndb])

include/mysql/plugin.h

+19 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
#define MYSQL_UDF_PLUGIN             0  /* User-defined function        */

#define MYSQL_STORAGE_ENGINE_PLUGIN  1  /* Storage Engine               */

#define MYSQL_FTPARSER_PLUGIN        2  /* Full-text parser plugin      */

#define MYSQL_MAX_PLUGIN_TYPE_NUM    3  /* The number of plugin types   */

#define MYSQL_DAEMON_PLUGIN          3  /* The daemon/raw plugin type */

#define MYSQL_MAX_PLUGIN_TYPE_NUM    4  /* The number of plugin types   */



/* We use the following strings to define licenses for plugins */

#define PLUGIN_LICENSE_PROPRIETARY 0
@@ -295,6 +296,13 @@ struct st_mysql_ftparser 
  int (*deinit)(MYSQL_FTPARSER_PARAM *param);

};



/*************************************************************************

  API for Storage Engine plugin. (MYSQL_DAEMON_PLUGIN)

*/



/* handlertons of different MySQL releases are incompatible */

#define MYSQL_DAEMON_INTERFACE_VERSION (MYSQL_VERSION_ID << 8)



/*************************************************************************

  API for Storage Engine plugin. (MYSQL_STORAGE_ENGINE_PLUGIN)

*/
@@ -313,5 +321,15 @@ struct st_mysql_storage_engine 
  int interface_version;

};



/*

  Here we define only the descriptor structure, that is referred from

  st_mysql_plugin.

*/



struct st_mysql_daemon

{

  int interface_version;

};



#endif

plugin/daemon_example/AUTHORS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Brian Aker <brian@mysql.com>

plugin/daemon_example/ChangeLog

0 → 100644
+2 −0
Original line number Diff line number Diff line 
0.1

  - Added

plugin/daemon_example/Makefile.am

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#Makefile.am example for a daemon

MYSQLDATAdir =          $(localstatedir)

MYSQLSHAREdir =         $(pkgdatadir)

MYSQLBASEdir=           $(prefix)

MYSQLLIBdir=            $(pkglibdir)

INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \

                        -I$(srcdir) 



EXTRA_LTLIBRARIES =	libdaemon_example.la

pkglib_LTLIBRARIES =	@plugin_daemon_example_shared_target@

libdaemon_example_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)

libdaemon_example_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN

libdaemon_example_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN

libdaemon_example_la_SOURCES =	daemon_example.c





EXTRA_LIBRARIES =	libdaemon_example.a

noinst_LIBRARIES =	@plugin_daemon_example_static_target@

libdaemon_example_a_CXXFLAGS =	$(AM_CFLAGS)

libdaemon_example_a_CFLAGS =	$(AM_CFLAGS)

libdaemon_example_a_SOURCES=	daemon_example.c