Merging into mysql-5.5.16-release.

10 files changed, 24 insertions, 12 deletions

diff --git a/plugin/audit_null/audit_null.c b/plugin/audit_null/audit_null.c
index 3fe5fa993f0..469e5ae494c 100644
--- a/plugin/audit_null/audit_null.c
+++ b/plugin/audit_null/audit_null.c
@@ -154,7 +154,8 @@ mysql_declare_plugin(audit_null)
   0x0002,                     /* version                         */
   simple_status,              /* status variables                */
   NULL,                       /* system variables                */
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/auth/auth_socket.c b/plugin/auth/auth_socket.c
index 9d26a791b06..7990552ce8f 100644
--- a/plugin/auth/auth_socket.c
+++ b/plugin/auth/auth_socket.c
@@ -88,7 +88,8 @@ mysql_declare_plugin(socket_auth)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/auth/dialog.c b/plugin/auth/dialog.c
index 41312f95674..490de346a1e 100644
--- a/plugin/auth/dialog.c
+++ b/plugin/auth/dialog.c
@@ -153,7 +153,8 @@ mysql_declare_plugin(dialog)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 },
 {
   MYSQL_AUTHENTICATION_PLUGIN,
@@ -167,7 +168,8 @@ mysql_declare_plugin(dialog)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/auth/qa_auth_interface.c b/plugin/auth/qa_auth_interface.c
index 0aa6c9ce20c..61e29fe9619 100644
--- a/plugin/auth/qa_auth_interface.c
+++ b/plugin/auth/qa_auth_interface.c
@@ -162,7 +162,8 @@ mysql_declare_plugin(test_plugin)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/auth/qa_auth_server.c b/plugin/auth/qa_auth_server.c
index 17171610200..4f1294e159f 100644
--- a/plugin/auth/qa_auth_server.c
+++ b/plugin/auth/qa_auth_server.c
@@ -82,6 +82,7 @@ mysql_declare_plugin(test_plugin)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
diff --git a/plugin/auth/test_plugin.c b/plugin/auth/test_plugin.c
index 912b6320579..efb32e8537d 100644
--- a/plugin/auth/test_plugin.c
+++ b/plugin/auth/test_plugin.c
@@ -125,7 +125,8 @@ mysql_declare_plugin(test_plugin)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 },
 {
   MYSQL_AUTHENTICATION_PLUGIN,
@@ -139,7 +140,8 @@ mysql_declare_plugin(test_plugin)
   0x0100,
   NULL,
   NULL,
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc
index b53772648b4..fbfc0fb5f97 100644
--- a/plugin/daemon_example/daemon_example.cc
+++ b/plugin/daemon_example/daemon_example.cc
@@ -201,6 +201,7 @@ mysql_declare_plugin(daemon_example)
   0x0100 /* 1.0 */,
   NULL,                       /* status variables                */
   NULL,                       /* system variables                */
-  NULL                        /* config options                  */
+  NULL,                       /* config options                  */
+  0,                          /* flags                           */
 }
 mysql_declare_plugin_end;
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index a15c8e21b32..d5f6d869ea1 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -267,7 +267,8 @@ mysql_declare_plugin(ftexample)
   0x0001,                     /* version                         */
   simple_status,              /* status variables                */
   simple_system_variables,    /* system variables                */
-  NULL
+  NULL,
+  0,
 }
 mysql_declare_plugin_end;
 
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc
index ea87adf98c4..9a325018242 100644
--- a/plugin/semisync/semisync_master_plugin.cc
+++ b/plugin/semisync/semisync_master_plugin.cc
@@ -429,6 +429,7 @@ mysql_declare_plugin(semi_sync_master)
   0x0100 /* 1.0 */,
   semi_sync_master_status_vars,	/* status variables */
   semi_sync_master_system_vars,	/* system variables */
-  NULL                        /* config options                  */
+  NULL,                         /* config options */
+  0,                            /* flags */
 }
 mysql_declare_plugin_end;
diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc
index cfb04bdd276..d5472b9cc83 100644
--- a/plugin/semisync/semisync_slave_plugin.cc
+++ b/plugin/semisync/semisync_slave_plugin.cc
@@ -225,6 +225,7 @@ mysql_declare_plugin(semi_sync_slave)
   0x0100 /* 1.0 */,
   semi_sync_slave_status_vars,	/* status variables */
   semi_sync_slave_system_vars,	/* system variables */
-  NULL                        /* config options                  */
+  NULL,                         /* config options */
+  0,                            /* flags */
 }
 mysql_declare_plugin_end;