Merge lp:~ignacio-nin/percona-server/5.1-bug1222777 into lp:percona-server/5.1
- 5.1-bug1222777
- Merge into 5.1
Proposed by
Ignacio Nin
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Fixing | ||
Review via email: mp+184635@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
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
-
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 | 14 | 14 | ||
6 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
7 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
9 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
10 | 18 | 18 | ||
11 | 19 | #define make_atomic_add_body(S) \ | 19 | #define make_atomic_add_body(S) \ |
12 | 20 | v= __sync_fetch_and_add(a, v); | 20 | v= __sync_fetch_and_add(a, v); |
13 | 21 | 21 | ||
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 | 11 | 11 | ||
19 | 12 | You should have received a copy of the GNU General Public License | 12 | You should have received a copy of the GNU General Public License |
20 | 13 | along with this program; if not, write to the Free Software | 13 | along with this program; if not, write to the Free Software |
22 | 14 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 14 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
23 | 15 | 15 | ||
24 | 16 | #ifndef _atomic_h_cleanup_ | 16 | #ifndef _atomic_h_cleanup_ |
25 | 17 | #define _atomic_h_cleanup_ "atomic/generic-msvc.h" | 17 | #define _atomic_h_cleanup_ "atomic/generic-msvc.h" |
26 | 18 | 18 | ||
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 | 14 | 14 | ||
32 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
33 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
35 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
36 | 18 | 18 | ||
37 | 19 | #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \ | 19 | #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \ |
38 | 20 | || defined(HAVE_GCC_ATOMIC_BUILTINS) \ | 20 | || defined(HAVE_GCC_ATOMIC_BUILTINS) \ |
39 | 21 | 21 | ||
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 | 14 | 14 | ||
45 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
46 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
48 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
49 | 18 | 18 | ||
50 | 19 | #define MY_ATOMIC_MODE_RWLOCKS 1 | 19 | #define MY_ATOMIC_MODE_RWLOCKS 1 |
51 | 20 | 20 | ||
52 | 21 | 21 | ||
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 | 11 | 11 | ||
58 | 12 | You should have received a copy of the GNU General Public License | 12 | You should have received a copy of the GNU General Public License |
59 | 13 | along with this program; if not, write to the Free Software | 13 | along with this program; if not, write to the Free Software |
61 | 14 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 14 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
62 | 15 | 15 | ||
63 | 16 | #ifndef _atomic_h_cleanup_ | 16 | #ifndef _atomic_h_cleanup_ |
64 | 17 | #define _atomic_h_cleanup_ "atomic/solaris.h" | 17 | #define _atomic_h_cleanup_ "atomic/solaris.h" |
65 | 18 | 18 | ||
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 | 14 | 14 | ||
71 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
72 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
74 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
75 | 18 | 18 | ||
76 | 19 | /* | 19 | /* |
77 | 20 | XXX 64-bit atomic operations can be implemented using | 20 | XXX 64-bit atomic operations can be implemented using |
78 | 21 | 21 | ||
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 | 14 | 14 | ||
84 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
85 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
87 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
88 | 18 | 18 | ||
89 | 19 | /* | 19 | /* |
90 | 20 | This header defines five atomic operations: | 20 | This header defines five atomic operations: |
91 | 21 | 21 | ||
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 | 14 | 14 | ||
97 | 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
98 | 16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
100 | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
101 | 18 | 18 | ||
102 | 19 | /* | 19 | /* |
103 | 20 | This header defines five atomic operations: | 20 | This header defines five atomic operations: |
104 | 21 | 21 | ||
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 | 44 | 44 | ||
110 | 45 | You should have received a copy of the GNU General Public License | 45 | You should have received a copy of the GNU General Public License |
111 | 46 | along with this program; if not, write to the Free Software | 46 | along with this program; if not, write to the Free Software |
113 | 47 | 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 */ |
114 | 48 | 48 | ||
115 | 49 | #ifdef USE_PRAGMA_INTERFACE | 49 | #ifdef USE_PRAGMA_INTERFACE |
116 | 50 | #pragma interface /* gcc class implementation */ | 50 | #pragma interface /* gcc class implementation */ |
117 | 51 | 51 | ||
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 | 39 | +# | 39 | +# |
123 | 40 | +# You should have received a copy of the GNU General Public License | 40 | +# You should have received a copy of the GNU General Public License |
124 | 41 | +# along with this program; if not, write to the Free Software | 41 | +# along with this program; if not, write to the Free Software |
126 | 42 | +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 42 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
127 | 43 | + | 43 | + |
128 | 44 | +# Process this file with automake to create Makefile.in | 44 | +# Process this file with automake to create Makefile.in |
129 | 45 | + | 45 | + |
130 | 46 | 46 | ||
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 | 39 | +# | 39 | +# |
136 | 40 | +# You should have received a copy of the GNU General Public License | 40 | +# You should have received a copy of the GNU General Public License |
137 | 41 | +# along with this program; if not, write to the Free Software | 41 | +# along with this program; if not, write to the Free Software |
139 | 42 | +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 42 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
140 | 43 | + | 43 | + |
141 | 44 | +# Process this file with automake to create Makefile.in | 44 | +# Process this file with automake to create Makefile.in |
142 | 45 | + | 45 | + |
143 | 46 | 46 | ||
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 | 22 | +++ Percona-Server-5.1.56/mysql-test/lib/My/SafeProcess/Makefile.am 2011-04-11 11:44:30.491637001 -0300 | 22 | +++ Percona-Server-5.1.56/mysql-test/lib/My/SafeProcess/Makefile.am 2011-04-11 11:44:30.491637001 -0300 |
149 | 23 | @@ -13,7 +13,7 @@ | 23 | @@ -13,7 +13,7 @@ |
150 | 24 | # along with this program; if not, write to the Free Software | 24 | # along with this program; if not, write to the Free Software |
152 | 25 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 25 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
153 | 26 | 26 | ||
154 | 27 | -testroot = $(prefix) | 27 | -testroot = $(prefix) |
155 | 28 | +testroot = $(prefix)/share | 28 | +testroot = $(prefix)/share |
156 | 29 | 29 | ||
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 | 2 | Version 2, June 1991 | 2 | Version 2, June 1991 |
162 | 3 | 3 | ||
163 | 4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc. | 4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
165 | 5 | 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA | 5 | 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA |
166 | 6 | 6 | ||
167 | 7 | Everyone is permitted to copy and distribute verbatim copies | 7 | Everyone is permitted to copy and distribute verbatim copies |
168 | 8 | of this license document, but changing it is not allowed. | 8 | of this license document, but changing it is not allowed. |
169 | @@ -316,7 +316,7 @@ | |||
170 | 316 | 316 | ||
171 | 317 | You should have received a copy of the GNU General Public License | 317 | You should have received a copy of the GNU General Public License |
172 | 318 | along with this program; if not, write to the Free Software | 318 | along with this program; if not, write to the Free Software |
174 | 319 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 319 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. |
175 | 320 | 320 | ||
176 | 321 | Also add information on how to contact you by electronic and paper mail. | 321 | Also add information on how to contact you by electronic and paper mail. |
177 | 322 | 322 | ||
178 | 323 | 323 | ||
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 | 12 | # | 12 | # |
184 | 13 | # You should have received a copy of the GNU Library General Public | 13 | # You should have received a copy of the GNU Library General Public |
185 | 14 | # License along with this library; if not, write to the Free | 14 | # License along with this library; if not, write to the Free |
187 | 15 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 15 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
188 | 16 | # MA 02111-1307, USA | 16 | # MA 02111-1307, USA |
189 | 17 | 17 | ||
190 | 18 | ## Process this file with automake to create Makefile.in | 18 | ## Process this file with automake to create Makefile.in |
191 | 19 | 19 | ||
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 | 28 | # | 28 | # |
197 | 29 | # You should have received a copy of the GNU Library General Public | 29 | # You should have received a copy of the GNU Library General Public |
198 | 30 | # License along with this library; if not, write to the Free | 30 | # License along with this library; if not, write to the Free |
200 | 31 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 31 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
201 | 32 | # MA 02111-1307, USA | 32 | # MA 02111-1307, USA |
202 | 33 | 33 | ||
203 | 34 | VPATH = @srcdir@ | 34 | VPATH = @srcdir@ |
204 | 35 | 35 | ||
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 | 13 | # | 13 | # |
210 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
211 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
213 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
214 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
215 | 18 | # | 18 | # |
216 | 19 | # AS3AP single-user benchmark. | 19 | # AS3AP single-user benchmark. |
217 | 20 | 20 | ||
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 | 13 | # | 13 | # |
223 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
224 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
226 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
227 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
228 | 18 | # | 18 | # |
229 | 19 | # Test of selecting on keys that consist of many parts | 19 | # Test of selecting on keys that consist of many parts |
230 | 20 | 20 | ||
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 | 13 | # | 13 | # |
236 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
237 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
239 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
240 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
241 | 18 | # | 18 | # |
242 | 19 | ########################################################## | 19 | ########################################################## |
243 | 20 | 20 | ||
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 | 13 | # | 13 | # |
249 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
250 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
252 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
253 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
254 | 18 | # | 18 | # |
255 | 19 | # a little program to generate a table of results | 19 | # a little program to generate a table of results |
256 | 20 | 20 | ||
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 | 13 | # | 13 | # |
262 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
263 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
265 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
266 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
267 | 18 | # | 18 | # |
268 | 19 | # start initialition | 19 | # start initialition |
269 | 20 | 20 | ||
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 | 14 | # | 14 | # |
275 | 15 | # You should have received a copy of the GNU Library General Public | 15 | # You should have received a copy of the GNU Library General Public |
276 | 16 | # License along with this library; if not, write to the Free | 16 | # License along with this library; if not, write to the Free |
278 | 17 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 17 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
279 | 18 | # MA 02111-1307, USA | 18 | # MA 02111-1307, USA |
280 | 19 | 19 | ||
281 | 20 | # Written by Monty for the TCX/Monty Program/Detron benchmark suite. | 20 | # Written by Monty for the TCX/Monty Program/Detron benchmark suite. |
282 | 21 | 21 | ||
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 | 13 | # | 13 | # |
288 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
289 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
291 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
292 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
293 | 18 | # | 18 | # |
294 | 19 | # This program runs all test that starts with 'test-' and sums | 19 | # This program runs all test that starts with 'test-' and sums |
295 | 20 | 20 | ||
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 | 14 | # | 14 | # |
301 | 15 | # You should have received a copy of the GNU Library General Public | 15 | # You should have received a copy of the GNU Library General Public |
302 | 16 | # License along with this library; if not, write to the Free | 16 | # License along with this library; if not, write to the Free |
304 | 17 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 17 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
305 | 18 | # MA 02111-1307, USA | 18 | # MA 02111-1307, USA |
306 | 19 | # | 19 | # |
307 | 20 | # The configuration file for the DBI/DBD tests on different databases .... | 20 | # The configuration file for the DBI/DBD tests on different databases .... |
308 | 21 | 21 | ||
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 | 13 | # | 13 | # |
314 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
315 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
317 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
318 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
319 | 18 | # | 18 | # |
320 | 19 | # Test of creating the ATIS database and doing many different selects on it | 19 | # Test of creating the ATIS database and doing many different selects on it |
321 | 20 | 20 | ||
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 | 13 | # | 13 | # |
327 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
328 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
330 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
331 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
332 | 18 | # | 18 | # |
333 | 19 | # Test of alter table | 19 | # Test of alter table |
334 | 20 | 20 | ||
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 | 13 | # | 13 | # |
340 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
341 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
343 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
344 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
345 | 18 | # | 18 | # |
346 | 19 | # Test of extreme tables. | 19 | # Test of extreme tables. |
347 | 20 | 20 | ||
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 | 13 | # | 13 | # |
353 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
354 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
356 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
357 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
358 | 18 | # | 18 | # |
359 | 19 | # This test is for testing the speed of connections and sending | 19 | # This test is for testing the speed of connections and sending |
360 | 20 | 20 | ||
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 | 13 | # | 13 | # |
366 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
367 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
369 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
370 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
371 | 18 | # | 18 | # |
372 | 19 | # This test is for testing how long it takes to create tables, | 19 | # This test is for testing how long it takes to create tables, |
373 | 20 | 20 | ||
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 | 13 | # | 13 | # |
379 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
380 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
382 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
383 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
384 | 18 | # | 18 | # |
385 | 19 | # Test of creating a simple table and inserting $record_count records in it, | 19 | # Test of creating a simple table and inserting $record_count records in it, |
386 | 20 | 20 | ||
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 | 13 | # | 13 | # |
392 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
393 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
395 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
396 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
397 | 18 | # | 18 | # |
398 | 19 | # Test of selecting on keys that consist of many parts | 19 | # Test of selecting on keys that consist of many parts |
399 | 20 | 20 | ||
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 | 13 | # | 13 | # |
405 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
406 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
408 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
409 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
410 | 18 | # | 18 | # |
411 | 19 | # Test of transactions performance. | 19 | # Test of transactions performance. |
412 | 20 | 20 | ||
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 | 13 | # | 13 | # |
418 | 14 | # You should have received a copy of the GNU Library General Public | 14 | # You should have received a copy of the GNU Library General Public |
419 | 15 | # License along with this library; if not, write to the Free | 15 | # License along with this library; if not, write to the Free |
421 | 16 | # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, | 16 | # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
422 | 17 | # MA 02111-1307, USA | 17 | # MA 02111-1307, USA |
423 | 18 | # | 18 | # |
424 | 19 | 19 | ||
425 | 20 | 20 | ||
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 | 13 | # | 13 | # |
431 | 14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
432 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
434 | 16 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
435 | 17 | # | 17 | # |
436 | 18 | 18 | ||
437 | 19 | import sys | 19 | import sys |
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).