Merge lp:~laurynas-biveinis/percona-pam-for-mysql/bug880268 into lp:percona-pam-for-mysql

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 6
Merge reported by: Laurynas Biveinis
Merged at revision: not available
Proposed branch: lp:~laurynas-biveinis/percona-pam-for-mysql/bug880268
Merge into: lp:percona-pam-for-mysql
Diff against target: 27 lines (+9/-1)
1 file modified
auth_pam.c (+9/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-pam-for-mysql/bug880268
Reviewer Review Type Date Requested Status
Stewart Smith Approve
Review via email: mp+80144@code.launchpad.net

Description of the change

Fix bug 880268: with MySQL 5.5.16, plugin compilation gives:

auth_pam.c:303:1: error: missing initializer [-Werror=missing-field-initializers]
auth_pam.c:303:1: error: (near initialization for ‘_mysql_plugin_declarations_[0].flags’) [-Werror=missing-field-initializers]
auth_pam.c:318:2: error: missing initializer [-Werror=missing-field-initializers]
auth_pam.c:318:2: error: (near initialization for ‘_mysql_plugin_declarations_[1].flags’) [-Werror=missing-field-initializers]
cc1: all warnings being treated as errors

MySQL 5.5.16 has introduced new flags field in st_plugin struct and
has bumped MYSQL_PLUGIN_INTERFACE_VERSION.

Fix by initializing it.

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'auth_pam.c'
2--- auth_pam.c 2011-06-22 13:49:35 +0000
3+++ auth_pam.c 2011-10-23 09:47:24 +0000
4@@ -300,6 +300,10 @@
5 NULL,
6 NULL,
7 NULL
8+#if MYSQL_PLUGIN_INTERFACE_VERSION >= 0x103
9+ ,
10+ 0
11+#endif
12 },
13 {
14 MYSQL_AUTHENTICATION_PLUGIN,
15@@ -315,7 +319,11 @@
16 NULL,
17 NULL,
18 NULL
19- }
20+#if MYSQL_PLUGIN_INTERFACE_VERSION >= 0x103
21+ ,
22+ 0
23+#endif
24+}
25 mysql_declare_plugin_end;
26
27 /* The client plugin */

Subscribers

People subscribed via source and target branches