Merge lp:~ignacio-nin/percona-server/5.6-bug1222777 into lp:percona-server/5.6

Proposed by Ignacio Nin on 2013-09-09
Status: Work in progress
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1222777
Merge into: lp:percona-server/5.6
Diff against target: 323 lines (+25/-25)
25 files modified
Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/Makefile.am (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/bootstrap (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/configure.ac (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/groups.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/groups.h (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c (+1/-1)
Percona-Server/sql/threadpool.h (+1/-1)
Percona-Server/sql/threadpool_common.cc (+1/-1)
Percona-Server/sql/threadpool_unix.cc (+1/-1)
Percona-Server/sql/threadpool_win.cc (+1/-1)
Percona-Server/storage/heap/hp_dspace.c (+1/-1)
Percona-Server/storage/heap/hp_record.c (+1/-1)
python-for-subunit2junitxml/subunit/tests/TestUtil.py (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1222777
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-09-09 Needs Fixing on 2013-09-09
Review via email: mp+184633@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Same comments as in the 5.5 MP.

review: Needs Fixing

Unmerged revisions

424. By Ignacio Nin on 2013-09-09

Update FSF's street address

The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu.org/licenses/gpl-2.0.html

Merge the fix from 5.5.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt'
2--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-08-21 07:39:21 +0000
3+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-09-09 17:42:35 +0000
4@@ -11,7 +11,7 @@
5 #
6 # You should have received a copy of the GNU General Public License
7 # along with this program; if not, write to the Free Software
8-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
9+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
10 #
11 IF(WITH_PAM)
12 INCLUDE (CheckLibraryExists)
13
14=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/Makefile.am'
15--- Percona-Server/plugin/percona-pam-for-mysql/Makefile.am 2011-11-09 11:57:27 +0000
16+++ Percona-Server/plugin/percona-pam-for-mysql/Makefile.am 2013-09-09 17:42:35 +0000
17@@ -11,7 +11,7 @@
18 #
19 # You should have received a copy of the GNU General Public License
20 # along with this program; if not, write to the Free Software
21-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 #
24
25 ACLOCAL_AMFLAGS = -I m4
26
27=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/bootstrap'
28--- Percona-Server/plugin/percona-pam-for-mysql/bootstrap 2012-02-01 14:42:43 +0000
29+++ Percona-Server/plugin/percona-pam-for-mysql/bootstrap 2013-09-09 17:42:35 +0000
30@@ -13,6 +13,6 @@
31 #
32 # You should have received a copy of the GNU General Public License
33 # along with this program; if not, write to the Free Software
34-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
35+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
36
37 autoreconf -i -I m4 -W all,no-obsolete
38
39=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in'
40--- Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in 2011-10-21 21:37:36 +0000
41+++ Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in 2013-09-09 17:42:35 +0000
42@@ -13,7 +13,7 @@
43 #
44 # You should have received a copy of the GNU General Public License
45 # along with this program; if not, write to the Free Software
46-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
47+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
48 #
49
50 # Bail out on errors, be strict
51
52=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in'
53--- Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in 2011-10-20 22:06:35 +0000
54+++ Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in 2013-09-09 17:42:35 +0000
55@@ -11,7 +11,7 @@
56 #
57 # You should have received a copy of the GNU General Public License
58 # along with this program; if not, write to the Free Software
59-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
60+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
61 #
62
63 Name: Percona-PAM-plugin
64
65=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/configure.ac'
66--- Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-08-21 07:39:21 +0000
67+++ Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-09-09 17:42:35 +0000
68@@ -12,7 +12,7 @@
69 #
70 # You should have received a copy of the GNU General Public License
71 # along with this program; if not, write to the Free Software
72-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
73+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
74 #
75 #
76 AC_PREREQ([2.59])
77
78=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am'
79--- Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-08-21 07:39:21 +0000
80+++ Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-09-09 17:42:35 +0000
81@@ -11,7 +11,7 @@
82 #
83 # You should have received a copy of the GNU General Public License
84 # along with this program; if not, write to the Free Software
85-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
86+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
87 #
88
89 plugindir = @PLUGINDIR@
90
91=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c'
92--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-08-21 07:39:21 +0000
93+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-09-09 17:42:35 +0000
94@@ -12,7 +12,7 @@
95
96 You should have received a copy of the GNU General Public License
97 along with this program; if not, write to the Free Software
98-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
99+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
100 */
101
102 #include "auth_mapping.h"
103
104=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h'
105--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-08-21 07:39:21 +0000
106+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-09-09 17:42:35 +0000
107@@ -14,7 +14,7 @@
108
109 You should have received a copy of the GNU General Public License
110 along with this program; if not, write to the Free Software
111- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
112+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
113 */
114
115 /**
116
117=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c'
118--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-08-21 07:39:21 +0000
119+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-09-09 17:42:35 +0000
120@@ -12,7 +12,7 @@
121
122 You should have received a copy of the GNU General Public License
123 along with this program; if not, write to the Free Software
124-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
125+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
126 */
127
128 /**
129
130=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c'
131--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-08-21 07:39:21 +0000
132+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-09-09 17:42:35 +0000
133@@ -12,7 +12,7 @@
134
135 You should have received a copy of the GNU General Public License
136 along with this program; if not, write to the Free Software
137-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
138+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
139 */
140
141 #ifdef HAVE_CONFIG_H
142
143=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h'
144--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h 2012-06-13 04:13:02 +0000
145+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h 2013-09-09 17:42:35 +0000
146@@ -14,7 +14,7 @@
147
148 You should have received a copy of the GNU General Public License
149 along with this program; if not, write to the Free Software
150- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
151+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
152 */
153
154 /**
155
156=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c'
157--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-08-21 07:39:21 +0000
158+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-09-09 17:42:35 +0000
159@@ -12,7 +12,7 @@
160
161 You should have received a copy of the GNU General Public License
162 along with this program; if not, write to the Free Software
163-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
164+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
165 */
166
167 /**
168
169=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.c'
170--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-08-21 07:39:21 +0000
171+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-09-09 17:42:35 +0000
172@@ -12,7 +12,7 @@
173
174 You should have received a copy of the GNU General Public License
175 along with this program; if not, write to the Free Software
176-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
177+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
178 */
179
180 #include <pwd.h>
181
182=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.h'
183--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-08-21 07:39:21 +0000
184+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-09-09 17:42:35 +0000
185@@ -14,7 +14,7 @@
186
187 You should have received a copy of the GNU General Public License
188 along with this program; if not, write to the Free Software
189- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
190+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
191 */
192
193 /**
194
195=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c'
196--- Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c 2012-02-01 14:42:43 +0000
197+++ Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c 2013-09-09 17:42:35 +0000
198@@ -12,7 +12,7 @@
199
200 You should have received a copy of the GNU General Public License
201 along with this program; if not, write to the Free Software
202- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
203+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
204 */
205
206 /**
207
208=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h'
209--- Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h 2011-10-20 19:07:25 +0000
210+++ Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h 2013-09-09 17:42:35 +0000
211@@ -14,7 +14,7 @@
212
213 You should have received a copy of the GNU General Public License
214 along with this program; if not, write to the Free Software
215- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
216+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
217 */
218
219 /**
220
221=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c'
222--- Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c 2012-02-01 14:42:43 +0000
223+++ Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c 2013-09-09 17:42:35 +0000
224@@ -12,7 +12,7 @@
225
226 You should have received a copy of the GNU General Public License
227 along with this program; if not, write to the Free Software
228- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
229+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
230 */
231
232 /**
233
234=== modified file 'Percona-Server/sql/threadpool.h'
235--- Percona-Server/sql/threadpool.h 2013-04-03 10:26:31 +0000
236+++ Percona-Server/sql/threadpool.h 2013-09-09 17:42:35 +0000
237@@ -11,7 +11,7 @@
238
239 You should have received a copy of the GNU General Public License
240 along with this program; if not, write to the Free Software
241- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
242+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
243
244 #define MAX_THREAD_GROUPS 128
245
246
247=== modified file 'Percona-Server/sql/threadpool_common.cc'
248--- Percona-Server/sql/threadpool_common.cc 2013-05-27 03:01:29 +0000
249+++ Percona-Server/sql/threadpool_common.cc 2013-09-09 17:42:35 +0000
250@@ -11,7 +11,7 @@
251
252 You should have received a copy of the GNU General Public License
253 along with this program; if not, write to the Free Software
254- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
255+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
256
257 #include <my_global.h>
258 #include <violite.h>
259
260=== modified file 'Percona-Server/sql/threadpool_unix.cc'
261--- Percona-Server/sql/threadpool_unix.cc 2013-05-27 03:01:29 +0000
262+++ Percona-Server/sql/threadpool_unix.cc 2013-09-09 17:42:35 +0000
263@@ -11,7 +11,7 @@
264
265 You should have received a copy of the GNU General Public License
266 along with this program; if not, write to the Free Software
267- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
268+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
269
270 #include <my_global.h>
271 #include <violite.h>
272
273=== modified file 'Percona-Server/sql/threadpool_win.cc'
274--- Percona-Server/sql/threadpool_win.cc 2013-01-30 09:55:26 +0000
275+++ Percona-Server/sql/threadpool_win.cc 2013-09-09 17:42:35 +0000
276@@ -11,7 +11,7 @@
277
278 You should have received a copy of the GNU General Public License
279 along with this program; if not, write to the Free Software
280- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
281+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
282
283 #ifdef _WIN32_WINNT
284 #undef _WIN32_WINNT
285
286=== modified file 'Percona-Server/storage/heap/hp_dspace.c'
287--- Percona-Server/storage/heap/hp_dspace.c 2012-04-18 23:26:28 +0000
288+++ Percona-Server/storage/heap/hp_dspace.c 2013-09-09 17:42:35 +0000
289@@ -12,7 +12,7 @@
290
291 You should have received a copy of the GNU General Public License
292 along with this program; if not, write to the Free Software
293- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
294+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
295
296 /*
297 Implements various base dataspace-related functions - allocate, free, clear
298
299=== modified file 'Percona-Server/storage/heap/hp_record.c'
300--- Percona-Server/storage/heap/hp_record.c 2013-05-06 15:43:51 +0000
301+++ Percona-Server/storage/heap/hp_record.c 2013-09-09 17:42:35 +0000
302@@ -12,7 +12,7 @@
303
304 You should have received a copy of the GNU General Public License
305 along with this program; if not, write to the Free Software
306- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
307+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
308
309 /*
310 Implements various base record-related functions, such as encode and decode
311
312=== modified file 'python-for-subunit2junitxml/subunit/tests/TestUtil.py'
313--- python-for-subunit2junitxml/subunit/tests/TestUtil.py 2013-05-27 13:46:13 +0000
314+++ python-for-subunit2junitxml/subunit/tests/TestUtil.py 2013-09-09 17:42:35 +0000
315@@ -13,7 +13,7 @@
316 #
317 # You should have received a copy of the GNU General Public License
318 # along with this program; if not, write to the Free Software
319-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
320+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
321 #
322
323 import sys

Subscribers

People subscribed via source and target branches