Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc

Author: Marc Alff

include/Makefile.am

@@ -19,7 +19,8 @@ BUILT_SOURCES =		$(HEADERS_GEN_MAKE) link_sources probes_mysql_nodtrace.h
 HEADERS_GEN_CONFIGURE =		mysql_version.h
 HEADERS_GEN_MAKE =		my_config.h
 HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \
-			my_list.h my_alloc.h typelib.h mysql/plugin.h
+			my_list.h my_alloc.h typelib.h mysql/plugin.h \
+			mysql/plugin_audit.h mysql/plugin_ftparser.h
 pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 			my_xml.h mysql_embed.h mysql/services.h \
 			mysql/service_my_snprintf.h mysql/service_thd_alloc.h \

include/mysql/plugin.h

@@ -66,8 +66,9 @@ typedef struct st_mysql_xid MYSQL_XID;
 #define MYSQL_FTPARSER_PLUGIN        2  /* Full-text parser plugin      */
 #define MYSQL_DAEMON_PLUGIN          3  /* The daemon/raw plugin type */
 #define MYSQL_INFORMATION_SCHEMA_PLUGIN  4  /* The I_S plugin type */
-#define MYSQL_REPLICATION_PLUGIN     5	/* The replication plugin type */
-#define MYSQL_MAX_PLUGIN_TYPE_NUM    6  /* The number of plugin types   */
+#define MYSQL_AUDIT_PLUGIN           5  /* The Audit plugin type        */
+#define MYSQL_REPLICATION_PLUGIN     6	/* The replication plugin type */
+#define MYSQL_MAX_PLUGIN_TYPE_NUM    7  /* The number of plugin types   */
 
 /* We use the following strings to define licenses for plugins */
 #define PLUGIN_LICENSE_PROPRIETARY 0
@@ -403,205 +404,43 @@ struct st_mysql_plugin
 /*************************************************************************
   API for Full-text parser plugin. (MYSQL_FTPARSER_PLUGIN)
 */
+#include "plugin_ftparser.h"
 
-#define MYSQL_FTPARSER_INTERFACE_VERSION 0x0100
-
-/* Parsing modes. Set in  MYSQL_FTPARSER_PARAM::mode */
-enum enum_ftparser_mode
-{
-/*
-  Fast and simple mode.  This mode is used for indexing, and natural
-  language queries.
-
-  The parser is expected to return only those words that go into the
-  index. Stopwords or too short/long words should not be returned. The
-  'boolean_info' argument of mysql_add_word() does not have to be set.
-*/
-  MYSQL_FTPARSER_SIMPLE_MODE= 0,
-
-/*
-  Parse with stopwords mode.  This mode is used in boolean searches for
-  "phrase matching."
-
-  The parser is not allowed to ignore words in this mode.  Every word
-  should be returned, including stopwords and words that are too short
-  or long.  The 'boolean_info' argument of mysql_add_word() does not
-  have to be set.
+/*************************************************************************
+  API for Storage Engine plugin. (MYSQL_DAEMON_PLUGIN)
 */
-  MYSQL_FTPARSER_WITH_STOPWORDS= 1,
 
-/*
-  Parse in boolean mode.  This mode is used to parse a boolean query string.
-
-  The parser should provide a valid MYSQL_FTPARSER_BOOLEAN_INFO
-  structure in the 'boolean_info' argument to mysql_add_word().
-  Usually that means that the parser should recognize boolean operators
-  in the parsing stream and set appropriate fields in
-  MYSQL_FTPARSER_BOOLEAN_INFO structure accordingly.  As for
-  MYSQL_FTPARSER_WITH_STOPWORDS mode, no word should be ignored.
-  Instead, use FT_TOKEN_STOPWORD for the token type of such a word.
-*/
-  MYSQL_FTPARSER_FULL_BOOLEAN_INFO= 2
-};
+/* handlertons of different MySQL releases are incompatible */
+#define MYSQL_DAEMON_INTERFACE_VERSION (MYSQL_VERSION_ID << 8)
 
 /*
-  Token types for boolean mode searching (used for the type member of
-  MYSQL_FTPARSER_BOOLEAN_INFO struct)
-
-  FT_TOKEN_EOF: End of data.
-  FT_TOKEN_WORD: Regular word.
-  FT_TOKEN_LEFT_PAREN: Left parenthesis (start of group/sub-expression).
-  FT_TOKEN_RIGHT_PAREN: Right parenthesis (end of group/sub-expression).
-  FT_TOKEN_STOPWORD: Stopword.
+  Here we define only the descriptor structure, that is referred from
+  st_mysql_plugin.
 */
 
-enum enum_ft_token_type
+struct st_mysql_daemon
 {
-  FT_TOKEN_EOF= 0,
-  FT_TOKEN_WORD= 1,
-  FT_TOKEN_LEFT_PAREN= 2,
-  FT_TOKEN_RIGHT_PAREN= 3,
-  FT_TOKEN_STOPWORD= 4
+  int interface_version;
 };
 
-/*
-  This structure is used in boolean search mode only. It conveys
-  boolean-mode metadata to the MySQL search engine for every word in
-  the search query. A valid instance of this structure must be filled
-  in by the plugin parser and passed as an argument in the call to
-  mysql_add_word (the callback function in the MYSQL_FTPARSER_PARAM
-  structure) when a query is parsed in boolean mode.
-
-  type: The token type.  Should be one of the enum_ft_token_type values.
-
-  yesno: Whether the word must be present for a match to occur:
-    >0 Must be present
-    <0 Must not be present
-    0  Neither; the word is optional but its presence increases the relevance
-  With the default settings of the ft_boolean_syntax system variable,
-  >0 corresponds to the '+' operator, <0 corrresponds to the '-' operator,
-  and 0 means neither operator was used.
-
-  weight_adjust: A weighting factor that determines how much a match
-  for the word counts.  Positive values increase, negative - decrease the
-  relative word's importance in the query.
-
-  wasign: The sign of the word's weight in the query. If it's non-negative
-  the match for the word will increase document relevance, if it's
-  negative - decrease (the word becomes a "noise word", the less of it the
-  better).
-
-  trunc: Corresponds to the '*' operator in the default setting of the
-  ft_boolean_syntax system variable.
-*/
-
-typedef struct st_mysql_ftparser_boolean_info
-{
-  enum enum_ft_token_type type;
-  int yesno;
-  int weight_adjust;
-  char wasign;
-  char trunc;
-  /* These are parser state and must be removed. */
-  char prev;
-  char *quot;
-} MYSQL_FTPARSER_BOOLEAN_INFO;
-
-/*
-  The following flag means that buffer with a string (document, word)
-  may be overwritten by the caller before the end of the parsing (that is
-  before st_mysql_ftparser::deinit() call). If one needs the string
-  to survive between two successive calls of the parsing function, she
-  needs to save a copy of it. The flag may be set by MySQL before calling
-  st_mysql_ftparser::parse(), or it may be set by a plugin before calling
-  st_mysql_ftparser_param::mysql_parse() or
-  st_mysql_ftparser_param::mysql_add_word().
-*/
-#define MYSQL_FTFLAGS_NEED_COPY 1
-
-/*
-  An argument of the full-text parser plugin. This structure is
-  filled in by MySQL server and passed to the parsing function of the
-  plugin as an in/out parameter.
-
-  mysql_parse: A pointer to the built-in parser implementation of the
-  server. It's set by the server and can be used by the parser plugin
-  to invoke the MySQL default parser.  If plugin's role is to extract
-  textual data from .doc, .pdf or .xml content, it might extract
-  plaintext from the content, and then pass the text to the default
-  MySQL parser to be parsed.
-
-  mysql_add_word: A server callback to add a new word.  When parsing
-  a document, the server sets this to point at a function that adds
-  the word to MySQL full-text index.  When parsing a search query,
-  this function will add the new word to the list of words to search
-  for.  The boolean_info argument can be NULL for all cases except
-  when mode is MYSQL_FTPARSER_FULL_BOOLEAN_INFO.
 
-  ftparser_state: A generic pointer. The plugin can set it to point
-  to information to be used internally for its own purposes.
-
-  mysql_ftparam: This is set by the server.  It is used by MySQL functions
-  called via mysql_parse() and mysql_add_word() callback.  The plugin
-  should not modify it.
-
-  cs: Information about the character set of the document or query string.
-
-  doc: A pointer to the document or query string to be parsed.
-
-  length: Length of the document or query string, in bytes.
-
-  flags: See MYSQL_FTFLAGS_* constants above.
-
-  mode: The parsing mode.  With boolean operators, with stopwords, or
-  nothing.  See  enum_ftparser_mode above.
+/*************************************************************************
+  API for I_S plugin. (MYSQL_INFORMATION_SCHEMA_PLUGIN)
 */
 
-typedef struct st_mysql_ftparser_param
-{
-  int (*mysql_parse)(struct st_mysql_ftparser_param *,
-                     char *doc, int doc_len);
-  int (*mysql_add_word)(struct st_mysql_ftparser_param *,
-                        char *word, int word_len,
-                        MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
-  void *ftparser_state;
-  void *mysql_ftparam;
-  struct charset_info_st *cs;
-  char *doc;
-  int length;
-  int flags;
-  enum enum_ftparser_mode mode;
-} MYSQL_FTPARSER_PARAM;
+/* handlertons of different MySQL releases are incompatible */
+#define MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION (MYSQL_VERSION_ID << 8)
 
 /*
-  Full-text parser descriptor.
-
-  interface_version is, e.g., MYSQL_FTPARSER_INTERFACE_VERSION.
-  The parsing, initialization, and deinitialization functions are
-  invoked per SQL statement for which the parser is used.
+  Here we define only the descriptor structure, that is referred from
+  st_mysql_plugin.
 */
 
-struct st_mysql_ftparser
+struct st_mysql_information_schema
 {
   int interface_version;
-  int (*parse)(MYSQL_FTPARSER_PARAM *param);
-  int (*init)(MYSQL_FTPARSER_PARAM *param);
-  int (*deinit)(MYSQL_FTPARSER_PARAM *param);
 };
 
-/*************************************************************************
-  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 I_S plugin. (MYSQL_INFORMATION_SCHEMA_PLUGIN)
-*/
-
-/* handlertons of different MySQL releases are incompatible */
-#define MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION (MYSQL_VERSION_ID << 8)
 
 /*************************************************************************
   API for Storage Engine plugin. (MYSQL_STORAGE_ENGINE_PLUGIN)
@@ -623,25 +462,6 @@ struct st_mysql_storage_engine
 
 struct handlerton;
 
-/*
-  Here we define only the descriptor structure, that is referred from
-  st_mysql_plugin.
-*/
-
-struct st_mysql_daemon
-{
-  int interface_version;
-};
-
-/*
-  Here we define only the descriptor structure, that is referred from
-  st_mysql_plugin.
-*/
-
-struct st_mysql_information_schema
-{
-  int interface_version;
-};
 
 /*
   API for Replication plugin. (MYSQL_REPLICATION_PLUGIN)
@@ -655,7 +475,7 @@ struct st_mysql_information_schema
    int interface_version;
  };
 
-/*
+/*************************************************************************
   st_mysql_value struct for reading values from mysqld.
   Used by server variables framework to parse user-provided values.
   Will be used for arguments when implementing UDFs.

include/mysql/plugin.h.pp

@@ -76,6 +76,8 @@
   struct st_mysql_sys_var **system_vars;
   void * __reserved1;
 };
+#include "plugin_ftparser.h"
+#include "plugin.h"
 enum enum_ftparser_mode
 {
   MYSQL_FTPARSER_SIMPLE_MODE= 0,
@@ -122,19 +124,19 @@
   int (*init)(MYSQL_FTPARSER_PARAM *param);
   int (*deinit)(MYSQL_FTPARSER_PARAM *param);
 };
-struct st_mysql_storage_engine
+struct st_mysql_daemon
 {
   int interface_version;
 };
-struct handlerton;
-struct st_mysql_daemon
+struct st_mysql_information_schema
 {
   int interface_version;
 };
-struct st_mysql_information_schema
+struct st_mysql_storage_engine
 {
   int interface_version;
 };
+struct handlerton;
  struct Mysql_replication {
    int interface_version;
  };