bk commit into 5.0-fulltext tree (svoj:1.2047)

[svoj]

Below is the list of changes that have just been committed into a local
5.0-fulltext 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.2047 05/12/19 14:42:22 svoj@stripped +1 -0
  WL#2575 - Fulltext: Parser plugin for FTS
  A check for plugin info interface version.

  sql/sql_plugin.cc
    1.20 05/12/19 14:42:12 svoj@stripped +17 -1
    A check for plugin info interface version.

# 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-cnet

--- 1.19/sql/sql_plugin.cc	2005-10-31 11:37:46 +04:00
+++ 1.20/sql/sql_plugin.cc	2005-12-19 14:42:12 +04:00
@@ -26,7 +26,12 @@
                    "_mysql_plugin_interface_version_";
 static const char *plugin_declarations_sym= "_mysql_plugin_declarations_";
 static int min_plugin_interface_version= 0x0000;
-
+static int min_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
+{
+  0x0000,
+  0x0000,
+  0x0000
+};
 static DYNAMIC_ARRAY plugin_dl_array;
 static DYNAMIC_ARRAY plugin_array;
 static HASH plugin_hash[MYSQL_MAX_PLUGIN_TYPE_NUM];
@@ -278,6 +283,17 @@
                        (const uchar *)plugin->name,
                        name_len))
     {
+      if (*(int*)plugin->info <
+          min_plugin_info_interface_version[plugin->type])
+      {
+        if (report & REPORT_TO_USER)
+          my_error(ER_CANT_OPEN_LIBRARY, MYF(0), dl->str, 0,
+                   "plugin interface version mismatch");
+        if (report & REPORT_TO_LOG)
+          sql_print_error(ER(ER_CANT_OPEN_LIBRARY), dl->str, 0,
+                          "plugin interface version mismatch");
+        goto err;
+      }
       tmp.plugin= plugin;
       tmp.name.str= (char *)plugin->name;
       tmp.name.length= name_len;