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

Proposed by Ignacio Nin on 2013-09-09
Status: Work in progress
Proposed branch: lp:~ignacio-nin/percona-server/5.1-bug1222777
Merge into: lp:percona-server/5.1
Diff against target: 437 lines (+34/-34)
33 files modified
Percona-Server/include/atomic/gcc_builtins.h (+1/-1)
Percona-Server/include/atomic/generic-msvc.h (+1/-1)
Percona-Server/include/atomic/nolock.h (+1/-1)
Percona-Server/include/atomic/rwlock.h (+1/-1)
Percona-Server/include/atomic/solaris.h (+1/-1)
Percona-Server/include/atomic/x86-gcc.h (+1/-1)
Percona-Server/include/my_atomic.h (+1/-1)
Percona-Server/mysys/my_atomic.c (+1/-1)
Percona-Server/sql/patch_info.h.pl (+1/-1)
build/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch (+1/-1)
build/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch (+1/-1)
build/debian/patches/60_usr_share_mysql_mysql_test.dpatch (+1/-1)
kewpie/sql-bench/COPYING (+2/-2)
kewpie/sql-bench/Makefile.am (+1/-1)
kewpie/sql-bench/Makefile.in (+1/-1)
kewpie/sql-bench/as3ap (+1/-1)
kewpie/sql-bench/bench-count-distinct (+1/-1)
kewpie/sql-bench/bench-init.pl (+1/-1)
kewpie/sql-bench/compare-results (+1/-1)
kewpie/sql-bench/copy-db (+1/-1)
kewpie/sql-bench/crash-me (+1/-1)
kewpie/sql-bench/run-all-tests (+1/-1)
kewpie/sql-bench/server-cfg (+1/-1)
kewpie/sql-bench/test-ATIS (+1/-1)
kewpie/sql-bench/test-alter-table (+1/-1)
kewpie/sql-bench/test-big-tables (+1/-1)
kewpie/sql-bench/test-connect (+1/-1)
kewpie/sql-bench/test-create (+1/-1)
kewpie/sql-bench/test-insert (+1/-1)
kewpie/sql-bench/test-select (+1/-1)
kewpie/sql-bench/test-transactions (+1/-1)
kewpie/sql-bench/test-wisconsin (+1/-1)
python-for-subunit2junitxml/subunit/tests/TestUtil.py (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1-bug1222777
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-09-09 Needs Fixing on 2013-09-09
Review via email: mp+184635@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Ignacio,

include/atomic/* files are upstream, I don't think we should modify upstream copyright notices.
Same about kewpie -- that's an upstream project, or even multiple upstream projects, so let's keep them intact.

And this patch is also missing log0online.h and log0online.c (there's a line break in the street address, so it may not show up in grep).

review: Needs Fixing
Stewart Smith (stewart) wrote :

Alexey Kopytov <email address hidden> writes:
> Same about kewpie -- that's an upstream project, or even multiple
> upstream projects, so let's keep them intact.

Let's fix in kewpie upstream too (even if we don't merge latest kewpie
in, let's at least fix it there as well as here).

But we should fix it here as well I think.

--
Stewart Smith

Unmerged revisions

578. 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/include/atomic/gcc_builtins.h'
2--- Percona-Server/include/atomic/gcc_builtins.h 2011-11-24 02:01:17 +0000
3+++ Percona-Server/include/atomic/gcc_builtins.h 2013-09-09 17:42:45 +0000
4@@ -14,7 +14,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 #define make_atomic_add_body(S) \
12 v= __sync_fetch_and_add(a, v);
13
14=== modified file 'Percona-Server/include/atomic/generic-msvc.h'
15--- Percona-Server/include/atomic/generic-msvc.h 2011-11-24 02:01:17 +0000
16+++ Percona-Server/include/atomic/generic-msvc.h 2013-09-09 17:42:45 +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 #ifndef _atomic_h_cleanup_
25 #define _atomic_h_cleanup_ "atomic/generic-msvc.h"
26
27=== modified file 'Percona-Server/include/atomic/nolock.h'
28--- Percona-Server/include/atomic/nolock.h 2011-11-24 02:01:17 +0000
29+++ Percona-Server/include/atomic/nolock.h 2013-09-09 17:42:45 +0000
30@@ -14,7 +14,7 @@
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 #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
38 || defined(HAVE_GCC_ATOMIC_BUILTINS) \
39
40=== modified file 'Percona-Server/include/atomic/rwlock.h'
41--- Percona-Server/include/atomic/rwlock.h 2011-11-24 02:01:17 +0000
42+++ Percona-Server/include/atomic/rwlock.h 2013-09-09 17:42:45 +0000
43@@ -14,7 +14,7 @@
44
45 You should have received a copy of the GNU General Public License
46 along with this program; if not, write to the Free Software
47- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
48+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
49
50 #define MY_ATOMIC_MODE_RWLOCKS 1
51
52
53=== modified file 'Percona-Server/include/atomic/solaris.h'
54--- Percona-Server/include/atomic/solaris.h 2011-11-24 02:01:17 +0000
55+++ Percona-Server/include/atomic/solaris.h 2013-09-09 17:42:45 +0000
56@@ -11,7 +11,7 @@
57
58 You should have received a copy of the GNU General Public License
59 along with this program; if not, write to the Free Software
60- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
61+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
62
63 #ifndef _atomic_h_cleanup_
64 #define _atomic_h_cleanup_ "atomic/solaris.h"
65
66=== modified file 'Percona-Server/include/atomic/x86-gcc.h'
67--- Percona-Server/include/atomic/x86-gcc.h 2011-11-24 02:01:17 +0000
68+++ Percona-Server/include/atomic/x86-gcc.h 2013-09-09 17:42:45 +0000
69@@ -14,7 +14,7 @@
70
71 You should have received a copy of the GNU General Public License
72 along with this program; if not, write to the Free Software
73- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
74+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
75
76 /*
77 XXX 64-bit atomic operations can be implemented using
78
79=== modified file 'Percona-Server/include/my_atomic.h'
80--- Percona-Server/include/my_atomic.h 2011-11-24 02:01:17 +0000
81+++ Percona-Server/include/my_atomic.h 2013-09-09 17:42:45 +0000
82@@ -14,7 +14,7 @@
83
84 You should have received a copy of the GNU General Public License
85 along with this program; if not, write to the Free Software
86- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
87+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
88
89 /*
90 This header defines five atomic operations:
91
92=== modified file 'Percona-Server/mysys/my_atomic.c'
93--- Percona-Server/mysys/my_atomic.c 2011-11-24 02:01:17 +0000
94+++ Percona-Server/mysys/my_atomic.c 2013-09-09 17:42:45 +0000
95@@ -14,7 +14,7 @@
96
97 You should have received a copy of the GNU General Public License
98 along with this program; if not, write to the Free Software
99- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
100+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
101
102 /*
103 This header defines five atomic operations:
104
105=== modified file 'Percona-Server/sql/patch_info.h.pl'
106--- Percona-Server/sql/patch_info.h.pl 2011-11-24 01:59:40 +0000
107+++ Percona-Server/sql/patch_info.h.pl 2013-09-09 17:42:45 +0000
108@@ -44,7 +44,7 @@
109
110 You should have received a copy of the GNU General Public License
111 along with this program; if not, write to the Free Software
112- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
113+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
114
115 #ifdef USE_PRAGMA_INTERFACE
116 #pragma interface /* gcc class implementation */
117
118=== modified file 'build/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch'
119--- build/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch 2010-05-31 13:57:21 +0000
120+++ build/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch 2013-09-09 17:42:45 +0000
121@@ -39,7 +39,7 @@
122 +#
123 +# You should have received a copy of the GNU General Public License
124 +# along with this program; if not, write to the Free Software
125-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
126++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
127 +
128 +# Process this file with automake to create Makefile.in
129 +
130
131=== modified file 'build/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch'
132--- build/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch 2010-05-31 13:57:21 +0000
133+++ build/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch 2013-09-09 17:42:45 +0000
134@@ -39,7 +39,7 @@
135 +#
136 +# You should have received a copy of the GNU General Public License
137 +# along with this program; if not, write to the Free Software
138-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
139++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
140 +
141 +# Process this file with automake to create Makefile.in
142 +
143
144=== modified file 'build/debian/patches/60_usr_share_mysql_mysql_test.dpatch'
145--- build/debian/patches/60_usr_share_mysql_mysql_test.dpatch 2011-04-12 04:45:12 +0000
146+++ build/debian/patches/60_usr_share_mysql_mysql_test.dpatch 2013-09-09 17:42:45 +0000
147@@ -22,7 +22,7 @@
148 +++ Percona-Server-5.1.56/mysql-test/lib/My/SafeProcess/Makefile.am 2011-04-11 11:44:30.491637001 -0300
149 @@ -13,7 +13,7 @@
150 # along with this program; if not, write to the Free Software
151- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
152+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
153
154 -testroot = $(prefix)
155 +testroot = $(prefix)/share
156
157=== modified file 'kewpie/sql-bench/COPYING'
158--- kewpie/sql-bench/COPYING 2011-10-05 20:26:34 +0000
159+++ kewpie/sql-bench/COPYING 2013-09-09 17:42:45 +0000
160@@ -2,7 +2,7 @@
161 Version 2, June 1991
162
163 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
164- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
165+ 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA
166
167 Everyone is permitted to copy and distribute verbatim copies
168 of this license document, but changing it is not allowed.
169@@ -316,7 +316,7 @@
170
171 You should have received a copy of the GNU General Public License
172 along with this program; if not, write to the Free Software
173- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
174+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
175
176 Also add information on how to contact you by electronic and paper mail.
177
178
179=== modified file 'kewpie/sql-bench/Makefile.am'
180--- kewpie/sql-bench/Makefile.am 2011-10-05 20:26:34 +0000
181+++ kewpie/sql-bench/Makefile.am 2013-09-09 17:42:45 +0000
182@@ -12,7 +12,7 @@
183 #
184 # You should have received a copy of the GNU Library General Public
185 # License along with this library; if not, write to the Free
186-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
187+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
188 # MA 02111-1307, USA
189
190 ## Process this file with automake to create Makefile.in
191
192=== modified file 'kewpie/sql-bench/Makefile.in'
193--- kewpie/sql-bench/Makefile.in 2011-10-05 20:26:34 +0000
194+++ kewpie/sql-bench/Makefile.in 2013-09-09 17:42:45 +0000
195@@ -28,7 +28,7 @@
196 #
197 # You should have received a copy of the GNU Library General Public
198 # License along with this library; if not, write to the Free
199-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
200+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
201 # MA 02111-1307, USA
202
203 VPATH = @srcdir@
204
205=== modified file 'kewpie/sql-bench/as3ap'
206--- kewpie/sql-bench/as3ap 2011-10-05 20:26:34 +0000
207+++ kewpie/sql-bench/as3ap 2013-09-09 17:42:45 +0000
208@@ -13,7 +13,7 @@
209 #
210 # You should have received a copy of the GNU Library General Public
211 # License along with this library; if not, write to the Free
212-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
213+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
214 # MA 02111-1307, USA
215 #
216 # AS3AP single-user benchmark.
217
218=== modified file 'kewpie/sql-bench/bench-count-distinct'
219--- kewpie/sql-bench/bench-count-distinct 2011-10-05 20:26:34 +0000
220+++ kewpie/sql-bench/bench-count-distinct 2013-09-09 17:42:45 +0000
221@@ -13,7 +13,7 @@
222 #
223 # You should have received a copy of the GNU Library General Public
224 # License along with this library; if not, write to the Free
225-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
226+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
227 # MA 02111-1307, USA
228 #
229 # Test of selecting on keys that consist of many parts
230
231=== modified file 'kewpie/sql-bench/bench-init.pl'
232--- kewpie/sql-bench/bench-init.pl 2011-10-05 20:26:34 +0000
233+++ kewpie/sql-bench/bench-init.pl 2013-09-09 17:42:45 +0000
234@@ -13,7 +13,7 @@
235 #
236 # You should have received a copy of the GNU Library General Public
237 # License along with this library; if not, write to the Free
238-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
239+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
240 # MA 02111-1307, USA
241 #
242 ##########################################################
243
244=== modified file 'kewpie/sql-bench/compare-results'
245--- kewpie/sql-bench/compare-results 2011-10-05 20:26:34 +0000
246+++ kewpie/sql-bench/compare-results 2013-09-09 17:42:45 +0000
247@@ -13,7 +13,7 @@
248 #
249 # You should have received a copy of the GNU Library General Public
250 # License along with this library; if not, write to the Free
251-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
252+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
253 # MA 02111-1307, USA
254 #
255 # a little program to generate a table of results
256
257=== modified file 'kewpie/sql-bench/copy-db'
258--- kewpie/sql-bench/copy-db 2011-10-05 20:26:34 +0000
259+++ kewpie/sql-bench/copy-db 2013-09-09 17:42:45 +0000
260@@ -13,7 +13,7 @@
261 #
262 # You should have received a copy of the GNU Library General Public
263 # License along with this library; if not, write to the Free
264-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
265+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
266 # MA 02111-1307, USA
267 #
268 # start initialition
269
270=== modified file 'kewpie/sql-bench/crash-me'
271--- kewpie/sql-bench/crash-me 2011-10-05 20:26:34 +0000
272+++ kewpie/sql-bench/crash-me 2013-09-09 17:42:45 +0000
273@@ -14,7 +14,7 @@
274 #
275 # You should have received a copy of the GNU Library General Public
276 # License along with this library; if not, write to the Free
277-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
278+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
279 # MA 02111-1307, USA
280
281 # Written by Monty for the TCX/Monty Program/Detron benchmark suite.
282
283=== modified file 'kewpie/sql-bench/run-all-tests'
284--- kewpie/sql-bench/run-all-tests 2011-10-05 20:26:34 +0000
285+++ kewpie/sql-bench/run-all-tests 2013-09-09 17:42:45 +0000
286@@ -13,7 +13,7 @@
287 #
288 # You should have received a copy of the GNU Library General Public
289 # License along with this library; if not, write to the Free
290-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
291+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
292 # MA 02111-1307, USA
293 #
294 # This program runs all test that starts with 'test-' and sums
295
296=== modified file 'kewpie/sql-bench/server-cfg'
297--- kewpie/sql-bench/server-cfg 2011-10-05 20:26:34 +0000
298+++ kewpie/sql-bench/server-cfg 2013-09-09 17:42:45 +0000
299@@ -14,7 +14,7 @@
300 #
301 # You should have received a copy of the GNU Library General Public
302 # License along with this library; if not, write to the Free
303-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
304+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
305 # MA 02111-1307, USA
306 #
307 # The configuration file for the DBI/DBD tests on different databases ....
308
309=== modified file 'kewpie/sql-bench/test-ATIS'
310--- kewpie/sql-bench/test-ATIS 2011-10-05 20:26:34 +0000
311+++ kewpie/sql-bench/test-ATIS 2013-09-09 17:42:45 +0000
312@@ -13,7 +13,7 @@
313 #
314 # You should have received a copy of the GNU Library General Public
315 # License along with this library; if not, write to the Free
316-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
317+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
318 # MA 02111-1307, USA
319 #
320 # Test of creating the ATIS database and doing many different selects on it
321
322=== modified file 'kewpie/sql-bench/test-alter-table'
323--- kewpie/sql-bench/test-alter-table 2011-10-05 20:26:34 +0000
324+++ kewpie/sql-bench/test-alter-table 2013-09-09 17:42:45 +0000
325@@ -13,7 +13,7 @@
326 #
327 # You should have received a copy of the GNU Library General Public
328 # License along with this library; if not, write to the Free
329-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
330+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
331 # MA 02111-1307, USA
332 #
333 # Test of alter table
334
335=== modified file 'kewpie/sql-bench/test-big-tables'
336--- kewpie/sql-bench/test-big-tables 2011-10-05 20:26:34 +0000
337+++ kewpie/sql-bench/test-big-tables 2013-09-09 17:42:45 +0000
338@@ -13,7 +13,7 @@
339 #
340 # You should have received a copy of the GNU Library General Public
341 # License along with this library; if not, write to the Free
342-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
343+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
344 # MA 02111-1307, USA
345 #
346 # Test of extreme tables.
347
348=== modified file 'kewpie/sql-bench/test-connect'
349--- kewpie/sql-bench/test-connect 2011-10-05 20:26:34 +0000
350+++ kewpie/sql-bench/test-connect 2013-09-09 17:42:45 +0000
351@@ -13,7 +13,7 @@
352 #
353 # You should have received a copy of the GNU Library General Public
354 # License along with this library; if not, write to the Free
355-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
356+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
357 # MA 02111-1307, USA
358 #
359 # This test is for testing the speed of connections and sending
360
361=== modified file 'kewpie/sql-bench/test-create'
362--- kewpie/sql-bench/test-create 2011-10-05 20:26:34 +0000
363+++ kewpie/sql-bench/test-create 2013-09-09 17:42:45 +0000
364@@ -13,7 +13,7 @@
365 #
366 # You should have received a copy of the GNU Library General Public
367 # License along with this library; if not, write to the Free
368-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
369+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
370 # MA 02111-1307, USA
371 #
372 # This test is for testing how long it takes to create tables,
373
374=== modified file 'kewpie/sql-bench/test-insert'
375--- kewpie/sql-bench/test-insert 2011-10-05 20:26:34 +0000
376+++ kewpie/sql-bench/test-insert 2013-09-09 17:42:45 +0000
377@@ -13,7 +13,7 @@
378 #
379 # You should have received a copy of the GNU Library General Public
380 # License along with this library; if not, write to the Free
381-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
382+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
383 # MA 02111-1307, USA
384 #
385 # Test of creating a simple table and inserting $record_count records in it,
386
387=== modified file 'kewpie/sql-bench/test-select'
388--- kewpie/sql-bench/test-select 2011-10-05 20:26:34 +0000
389+++ kewpie/sql-bench/test-select 2013-09-09 17:42:45 +0000
390@@ -13,7 +13,7 @@
391 #
392 # You should have received a copy of the GNU Library General Public
393 # License along with this library; if not, write to the Free
394-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
395+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
396 # MA 02111-1307, USA
397 #
398 # Test of selecting on keys that consist of many parts
399
400=== modified file 'kewpie/sql-bench/test-transactions'
401--- kewpie/sql-bench/test-transactions 2011-10-05 20:26:34 +0000
402+++ kewpie/sql-bench/test-transactions 2013-09-09 17:42:45 +0000
403@@ -13,7 +13,7 @@
404 #
405 # You should have received a copy of the GNU Library General Public
406 # License along with this library; if not, write to the Free
407-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
408+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
409 # MA 02111-1307, USA
410 #
411 # Test of transactions performance.
412
413=== modified file 'kewpie/sql-bench/test-wisconsin'
414--- kewpie/sql-bench/test-wisconsin 2011-10-05 20:26:34 +0000
415+++ kewpie/sql-bench/test-wisconsin 2013-09-09 17:42:45 +0000
416@@ -13,7 +13,7 @@
417 #
418 # You should have received a copy of the GNU Library General Public
419 # License along with this library; if not, write to the Free
420-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
421+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
422 # MA 02111-1307, USA
423 #
424
425
426=== modified file 'python-for-subunit2junitxml/subunit/tests/TestUtil.py'
427--- python-for-subunit2junitxml/subunit/tests/TestUtil.py 2011-10-06 06:45:16 +0000
428+++ python-for-subunit2junitxml/subunit/tests/TestUtil.py 2013-09-09 17:42:45 +0000
429@@ -13,7 +13,7 @@
430 #
431 # You should have received a copy of the GNU General Public License
432 # along with this program; if not, write to the Free Software
433-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
434+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
435 #
436
437 import sys

Subscribers

People subscribed via source and target branches