summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2010-02-04 12:14:32 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2010-02-04 12:14:32 +0800
commitb7289d6dc5b8de6573903f55994a4483f3ece389 (patch)
tree0f0eb03b4b770cf2842ce0652fddfa4bf84f56bc /include/mysql
parentb17c1a796156c98b08d03ea5bd40cba006fcd748 (diff)
downloadmariadb-git-b7289d6dc5b8de6573903f55994a4483f3ece389.tar.gz
Bug#49894 shifted MYSQL_REPLICATION_PLUGIN number
The number for MYSQL_REPLICATION_PLUGIN was shifted when backporting because MYSQL_AUDIT_PLUGIN was not backported. This problem is fixed by backporting only the number of audit plugin and print an error when trying to load audit plugins. Note that replication plugins compiled against old MYSQL_REPLICATION_PLUGIN number will also be recognized as audit plugin and be rejected.
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/plugin.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 45d0234cb67..98b1cec0641 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -80,8 +80,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