bk commit into 5.1 tree (baker:1.2354)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.1 repository of baker. When baker 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@stripped, 2006-11-11 02:06:46+01:00, baker@stripped +4 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
  MERGE: 1.2334.10.1

  configure.in@stripped, 2006-11-11 02:06:41+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.392.2.1

  include/mysql/plugin.h@stripped, 2006-11-11 02:06:41+01:00, baker@stripped +0
-1
    Auto merged
    MERGE: 1.21.1.1

  sql/mysqld.cc@stripped, 2006-11-11 02:06:41+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.588.1.1

  sql/sql_plugin.cc@stripped, 2006-11-11 02:06:41+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.36.1.1

# 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:	baker
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-arch/RESYNC

--- 1.396/configure.in	2006-11-11 02:06:53 +01:00
+++ 1.397/configure.in	2006-11-11 02:06:53 +01:00
@@ -2164,10 +2164,6 @@
 # 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])

--- 1.589/sql/mysqld.cc	2006-11-11 02:06:53 +01:00
+++ 1.590/sql/mysqld.cc	2006-11-11 02:06:53 +01:00
@@ -7026,11 +7026,6 @@
 #else
   have_innodb= SHOW_OPTION_NO;
 #endif
-#ifdef WITH_EXAMPLE_STORAGE_ENGINE
-  have_example_db= SHOW_OPTION_YES;
-#else
-  have_example_db= SHOW_OPTION_NO;
-#endif
 #ifdef WITH_ARCHIVE_STORAGE_ENGINE
   have_archive_db= SHOW_OPTION_YES;
 #else
@@ -8136,7 +8131,6 @@
 *****************************************************************************/
 #undef have_innodb
 #undef have_ndbcluster
-#undef have_example_db
 #undef have_archive_db
 #undef have_csv_db
 #undef have_federated_db
@@ -8146,7 +8140,6 @@
 
 SHOW_COMP_OPTION have_innodb= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_ndbcluster= SHOW_OPTION_NO;
-SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_csv_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_federated_db= SHOW_OPTION_NO;

--- 1.22/include/mysql/plugin.h	2006-11-11 02:06:53 +01:00
+++ 1.23/include/mysql/plugin.h	2006-11-11 02:06:53 +01:00
@@ -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
@@ -296,6 +297,13 @@
 };
 
 /*************************************************************************
+  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)
 */
 
@@ -309,6 +317,16 @@
 */
 
 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;
 };

--- 1.37/sql/sql_plugin.cc	2006-11-11 02:06:53 +01:00
+++ 1.38/sql/sql_plugin.cc	2006-11-11 02:06:53 +01:00
@@ -23,21 +23,26 @@
 
 char *opt_plugin_dir_ptr;
 char opt_plugin_dir[FN_REFLEN];
+/*
+  When you ad a new plugin type, add both a string and make sure that the 
+  init and deinit array are correctly updated.
+*/
 const LEX_STRING plugin_type_names[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 {
   { C_STRING_WITH_LEN("UDF") },
   { C_STRING_WITH_LEN("STORAGE ENGINE") },
-  { C_STRING_WITH_LEN("FTPARSER") }
+  { C_STRING_WITH_LEN("FTPARSER") },
+  { C_STRING_WITH_LEN("DAEMON") }
 };
 
 plugin_type_init plugin_type_initialize[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 {
-  0,ha_initialize_handlerton,0
+  0,ha_initialize_handlerton,0,0
 };
 
 plugin_type_init plugin_type_deinitialize[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 {
-  0,ha_finalize_handlerton,0
+  0,ha_finalize_handlerton,0,0
 };
 
 static const char *plugin_interface_version_sym=
@@ -53,13 +58,15 @@
 {
   0x0000,
   MYSQL_HANDLERTON_INTERFACE_VERSION,
-  MYSQL_FTPARSER_INTERFACE_VERSION
+  MYSQL_FTPARSER_INTERFACE_VERSION,
+  MYSQL_DAEMON_INTERFACE_VERSION
 };
 static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 {
   0x0000, /* UDF: not implemented */
   MYSQL_HANDLERTON_INTERFACE_VERSION,
-  MYSQL_FTPARSER_INTERFACE_VERSION
+  MYSQL_FTPARSER_INTERFACE_VERSION,
+  MYSQL_DAEMON_INTERFACE_VERSION
 };
 
 static DYNAMIC_ARRAY plugin_dl_array;