bk commit into 5.1 tree (svoj:1.2372) BUG#23255

[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@stripped, 2006-12-05 18:05:53+04:00, svoj@stripped +1 -0
  BUG#23255 - Missing version parameter in plugin declaration example
  
  Plugin interface version was not raised properly after incompatible
  changes to plugin structure were introduced.
  
  Fixed plugin interface version according to worklog 2761.

  include/mysql/plugin.h@stripped, 2006-12-05 18:05:50+04:00, svoj@stripped +2 -2
    Fixed plugin interface version according to worklog 2761.

# 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/BUG23255/mysql-5.1-engines

--- 1.23/include/mysql/plugin.h	2006-12-05 18:05:59 +04:00
+++ 1.24/include/mysql/plugin.h	2006-12-05 18:05:59 +04:00
@@ -21,7 +21,7 @@
   Plugin API. Common for all plugin types.
 */
 
-#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0002
+#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0100
 
 /*
   The allowable types of plugins
@@ -98,7 +98,7 @@ struct st_mysql_plugin
   const char *name;     /* plugin name                                  */
   const char *author;   /* plugin author (for SHOW PLUGINS)             */
   const char *descr;    /* general descriptive text (for SHOW PLUGINS ) */
-  int license;             /* the plugin type (a MYSQL_XXX_PLUGIN value)   */
+  int license;          /* the plugin license (PLUGIN_LICENSE_XXX)      */
   int (*init)(void *);  /* the function to invoke when plugin is loaded */
   int (*deinit)(void *);/* the function to invoke when plugin is unloaded */
   unsigned int version; /* plugin version (for SHOW PLUGINS)            */