summaryrefslogtreecommitdiff
path: root/plugin/auth
diff options
context:
space:
mode:
authorMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
committerMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
commitee789c28b4cf1ac42f975730b567016d3965ea81 (patch)
treea54b38fc92199ba1d0a8467adb980856f5effafe /plugin/auth
parentdca971de92e1faa4ea5ff6efc79923de60a6ab86 (diff)
downloadmariadb-git-ee789c28b4cf1ac42f975730b567016d3965ea81.tar.gz
Merging into mysql-5.5.16-release.
Diffstat (limited to 'plugin/auth')
-rw-r--r--plugin/auth/auth_socket.c3
-rw-r--r--plugin/auth/dialog.c6
-rw-r--r--plugin/auth/qa_auth_interface.c3
-rw-r--r--plugin/auth/qa_auth_server.c3
-rw-r--r--plugin/auth/test_plugin.c6
5 files changed, 14 insertions, 7 deletions
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;