Merge xiphis.org:/home/antony/work2/mysql-5.1-engines

into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge


include/mysql.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
configure.in:
  fix merge conflict

1 files changed, 2 insertions, 2 deletions

diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 1385bb502bb..d5c4a975602 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -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)            */