Commit 76cdfbbd authored by unknown's avatar unknown
Browse files

Added license information display to output of plugins schema, and tagged all... 

Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 


include/mysql/plugin.h:
  Adding license information.
plugin/fulltext/plugin_example.c:
  License
sql/ha_ndbcluster.cc:
  License
sql/ha_partition.cc:
  License
sql/handler.h:
  License
sql/log.cc:
  License
sql/sql_show.cc:
  Additional PLUIN display information
storage/archive/ha_archive.cc:
  License information added
storage/blackhole/ha_blackhole.cc:
  License information added
storage/csv/ha_tina.cc:
  License Information
storage/example/ha_example.cc:
  License information
storage/federated/ha_federated.cc:
  License Information
storage/heap/ha_heap.cc:
  License Information
storage/innobase/handler/ha_innodb.cc:
  License Information
storage/myisam/ha_myisam.cc:
  License Information
storage/myisammrg/ha_myisammrg.cc:
  License Information
parent c8b64ea1

include/mysql/plugin.h

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ 
#define MYSQL_FTPARSER_PLUGIN        2  /* Full-text parser plugin      */

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



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

#define PLUGIN_LICENSE_PROPRIETARY 0

#define PLUGIN_LICENSE_GPL 1

#define PLUGIN_LICENSE_BSD 2



#define PLUGIN_LICENSE_PROPRIETARY_STRING "PROPRIETARY"

#define PLUGIN_LICENSE_GPL_STRING "GPL"

#define PLUGIN_LICENSE_BSD_STRING "BSD"



/*

  Macros for beginning and ending plugin declarations.  Between

  mysql_declare_plugin and mysql_declare_plugin_end there should
@@ -88,6 +97,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 (*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)            */

plugin/fulltext/plugin_example.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ mysql_declare_plugin(ftexample) 
  "simple_parser",            /* name                            */

  "MySQL AB",                 /* author                          */

  "Simple Full-Text Parser",  /* description                     */

  PLUGIN_LICENSE_GPL,

  simple_parser_plugin_init,  /* init function (when loaded)     */

  simple_parser_plugin_deinit,/* deinit function (when unloaded) */

  0x0001,                     /* version                         */

sql/ha_ndbcluster.cc

+1 −0
Original line number Diff line number Diff line
@@ -10773,6 +10773,7 @@ mysql_declare_plugin(ndbcluster) 
  ndbcluster_hton_name,

  "MySQL AB",

  "Clustered, fault-tolerant tables",

  PLUGIN_LICENSE_GPL,

  ndbcluster_init, /* Plugin Init */

  NULL, /* Plugin Deinit */

  0x0100 /* 1.0 */,

sql/ha_partition.cc

+1 −0
Original line number Diff line number Diff line
@@ -5643,6 +5643,7 @@ mysql_declare_plugin(partition) 
  "partition",

  "Mikael Ronstrom, MySQL AB",

  "Partition Storage Engine Helper",

  PLUGIN_LICENSE_GPL,

  partition_initialize, /* Plugin Init */

  NULL, /* Plugin Deinit */

  0x0100, /* 1.0 */

sql/handler.h

+1 −0
Original line number Diff line number Diff line
@@ -683,6 +683,7 @@ struct handlerton 
                     const char *wild, bool dir, List<char> *files);

   int (*table_exists_in_engine)(handlerton *hton, THD* thd, const char *db,

                                 const char *name);

   uint32 license; /* Flag for Engine License */

};