Merge lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338012 into lp:~ourdelta-core/ourdelta/trunk015fmt
- ourdelta-fix-bug338012
- Merge into trunk015fmt
Proposed by
Neil Katin
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338012 | ||||
Merge into: | lp:~ourdelta-core/ourdelta/trunk015fmt | ||||
Diff against target: | None lines | ||||
To merge this branch: | bzr merge lp:~d-launchpad-askneil-com/ourdelta/ourdelta-fix-bug338012 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OurDelta-core | Pending | ||
Review via email: mp+6725@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 55. By neil <neil@dev00>
-
Fixes bug 338012 by changing user_stats to use HOSTNAME_LENGTH for index length
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'mysql/5.0/percona_maintained/userstatv2.patch' |
2 | --- mysql/5.0/percona_maintained/userstatv2.patch 2009-03-18 01:10:58 +0000 |
3 | +++ mysql/5.0/percona_maintained/userstatv2.patch 2009-05-21 06:16:03 +0000 |
4 | @@ -1,51 +1,56 @@ |
5 | -diff -r 23e5576aa59a BUILD/Makefile.in |
6 | ---- a/BUILD/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
7 | -+++ b/BUILD/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
8 | -@@ -146,6 +146,7 @@ |
9 | - LIBDL = @LIBDL@ |
10 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
11 | - LIBOBJS = @LIBOBJS@ |
12 | -+LIBRT = @LIBRT@ |
13 | - LIBS = @LIBS@ |
14 | - LIBTOOL = @LIBTOOL@ |
15 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
16 | -diff -r 23e5576aa59a Docs/Makefile.in |
17 | ---- a/Docs/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
18 | -+++ b/Docs/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
19 | -@@ -144,6 +144,7 @@ |
20 | - LIBDL = @LIBDL@ |
21 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
22 | - LIBOBJS = @LIBOBJS@ |
23 | -+LIBRT = @LIBRT@ |
24 | - LIBS = @LIBS@ |
25 | - LIBTOOL = @LIBTOOL@ |
26 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
27 | -diff -r 23e5576aa59a Makefile.in |
28 | ---- a/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
29 | -+++ b/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
30 | -@@ -171,6 +171,7 @@ |
31 | - LIBDL = @LIBDL@ |
32 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
33 | - LIBOBJS = @LIBOBJS@ |
34 | -+LIBRT = @LIBRT@ |
35 | - LIBS = @LIBS@ |
36 | - LIBTOOL = @LIBTOOL@ |
37 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
38 | -diff -r 23e5576aa59a SSL/Makefile.in |
39 | ---- a/SSL/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
40 | -+++ b/SSL/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
41 | -@@ -144,6 +144,7 @@ |
42 | - LIBDL = @LIBDL@ |
43 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
44 | - LIBOBJS = @LIBOBJS@ |
45 | -+LIBRT = @LIBRT@ |
46 | - LIBS = @LIBS@ |
47 | - LIBTOOL = @LIBTOOL@ |
48 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
49 | -diff -r 23e5576aa59a aclocal.m4 |
50 | ---- a/aclocal.m4 Tue Feb 17 22:33:00 2009 -0800 |
51 | -+++ b/aclocal.m4 Tue Feb 17 22:33:23 2009 -0800 |
52 | -@@ -4412,6 +4412,9 @@ |
53 | +Index: mysql-5.0.77/BUILD/Makefile.in |
54 | +=================================================================== |
55 | +--- mysql-5.0.77.orig/BUILD/Makefile.in |
56 | ++++ mysql-5.0.77/BUILD/Makefile.in |
57 | +@@ -146,6 +146,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
58 | + LIBDL = @LIBDL@ |
59 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
60 | + LIBOBJS = @LIBOBJS@ |
61 | ++LIBRT = @LIBRT@ |
62 | + LIBS = @LIBS@ |
63 | + LIBTOOL = @LIBTOOL@ |
64 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
65 | +Index: mysql-5.0.77/Docs/Makefile.in |
66 | +=================================================================== |
67 | +--- mysql-5.0.77.orig/Docs/Makefile.in |
68 | ++++ mysql-5.0.77/Docs/Makefile.in |
69 | +@@ -144,6 +144,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
70 | + LIBDL = @LIBDL@ |
71 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
72 | + LIBOBJS = @LIBOBJS@ |
73 | ++LIBRT = @LIBRT@ |
74 | + LIBS = @LIBS@ |
75 | + LIBTOOL = @LIBTOOL@ |
76 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
77 | +Index: mysql-5.0.77/Makefile.in |
78 | +=================================================================== |
79 | +--- mysql-5.0.77.orig/Makefile.in |
80 | ++++ mysql-5.0.77/Makefile.in |
81 | +@@ -171,6 +171,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
82 | + LIBDL = @LIBDL@ |
83 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
84 | + LIBOBJS = @LIBOBJS@ |
85 | ++LIBRT = @LIBRT@ |
86 | + LIBS = @LIBS@ |
87 | + LIBTOOL = @LIBTOOL@ |
88 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
89 | +Index: mysql-5.0.77/SSL/Makefile.in |
90 | +=================================================================== |
91 | +--- mysql-5.0.77.orig/SSL/Makefile.in |
92 | ++++ mysql-5.0.77/SSL/Makefile.in |
93 | +@@ -144,6 +144,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
94 | + LIBDL = @LIBDL@ |
95 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
96 | + LIBOBJS = @LIBOBJS@ |
97 | ++LIBRT = @LIBRT@ |
98 | + LIBS = @LIBS@ |
99 | + LIBTOOL = @LIBTOOL@ |
100 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
101 | +Index: mysql-5.0.77/aclocal.m4 |
102 | +=================================================================== |
103 | +--- mysql-5.0.77.orig/aclocal.m4 |
104 | ++++ mysql-5.0.77/aclocal.m4 |
105 | +@@ -4412,6 +4412,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) |
106 | # Is the compiler the GNU C compiler? |
107 | with_gcc=$_LT_AC_TAGVAR(GCC, $1) |
108 | |
109 | @@ -55,7 +60,7 @@ |
110 | # An ERE matcher. |
111 | EGREP=$lt_EGREP |
112 | |
113 | -@@ -4545,11 +4548,11 @@ |
114 | +@@ -4545,11 +4548,11 @@ striplib=$lt_striplib |
115 | |
116 | # Dependencies to place before the objects being linked to create a |
117 | # shared library. |
118 | @@ -69,7 +74,7 @@ |
119 | |
120 | # Dependencies to place before the objects being linked to create a |
121 | # shared library. |
122 | -@@ -4561,7 +4564,7 @@ |
123 | +@@ -4561,7 +4564,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $ |
124 | |
125 | # The library search path used internally by the compiler when linking |
126 | # a shared library. |
127 | @@ -78,7 +83,7 @@ |
128 | |
129 | # Method to check whether dependent libraries are shared objects. |
130 | deplibs_check_method=$lt_deplibs_check_method |
131 | -@@ -4641,7 +4644,7 @@ |
132 | +@@ -4641,7 +4644,7 @@ variables_saved_for_relink="$variables_s |
133 | link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) |
134 | |
135 | # Compile-time system search path for libraries |
136 | @@ -87,10 +92,11 @@ |
137 | |
138 | # Run-time system search path for libraries |
139 | sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec |
140 | -diff -r 23e5576aa59a client/Makefile.in |
141 | ---- a/client/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
142 | -+++ b/client/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
143 | -@@ -247,6 +247,7 @@ |
144 | +Index: mysql-5.0.77/client/Makefile.in |
145 | +=================================================================== |
146 | +--- mysql-5.0.77.orig/client/Makefile.in |
147 | ++++ mysql-5.0.77/client/Makefile.in |
148 | +@@ -247,6 +247,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
149 | LIBDL = @LIBDL@ |
150 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
151 | LIBOBJS = @LIBOBJS@ |
152 | @@ -98,43 +104,47 @@ |
153 | LIBS = @CLIENT_LIBS@ |
154 | LIBTOOL = @LIBTOOL@ |
155 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
156 | -diff -r 23e5576aa59a cmd-line-utils/Makefile.in |
157 | ---- a/cmd-line-utils/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
158 | -+++ b/cmd-line-utils/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
159 | -@@ -157,6 +157,7 @@ |
160 | - LIBDL = @LIBDL@ |
161 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
162 | - LIBOBJS = @LIBOBJS@ |
163 | -+LIBRT = @LIBRT@ |
164 | - LIBS = @LIBS@ |
165 | - LIBTOOL = @LIBTOOL@ |
166 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
167 | -diff -r 23e5576aa59a cmd-line-utils/libedit/Makefile.in |
168 | ---- a/cmd-line-utils/libedit/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
169 | -+++ b/cmd-line-utils/libedit/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
170 | -@@ -175,6 +175,7 @@ |
171 | - LIBDL = @LIBDL@ |
172 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
173 | - LIBOBJS = @LIBOBJS@ |
174 | -+LIBRT = @LIBRT@ |
175 | - LIBS = @LIBS@ |
176 | - LIBTOOL = @LIBTOOL@ |
177 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
178 | -diff -r 23e5576aa59a cmd-line-utils/readline/Makefile.in |
179 | ---- a/cmd-line-utils/readline/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
180 | -+++ b/cmd-line-utils/readline/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
181 | -@@ -173,6 +173,7 @@ |
182 | - LIBDL = @LIBDL@ |
183 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
184 | - LIBOBJS = @LIBOBJS@ |
185 | -+LIBRT = @LIBRT@ |
186 | - LIBS = @LIBS@ |
187 | - LIBTOOL = @LIBTOOL@ |
188 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
189 | -diff -r 23e5576aa59a configure |
190 | ---- a/configure Tue Feb 17 22:33:00 2009 -0800 |
191 | -+++ b/configure Tue Feb 17 22:33:23 2009 -0800 |
192 | -@@ -39583,7 +39583,91 @@ |
193 | +Index: mysql-5.0.77/cmd-line-utils/Makefile.in |
194 | +=================================================================== |
195 | +--- mysql-5.0.77.orig/cmd-line-utils/Makefile.in |
196 | ++++ mysql-5.0.77/cmd-line-utils/Makefile.in |
197 | +@@ -157,6 +157,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
198 | + LIBDL = @LIBDL@ |
199 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
200 | + LIBOBJS = @LIBOBJS@ |
201 | ++LIBRT = @LIBRT@ |
202 | + LIBS = @LIBS@ |
203 | + LIBTOOL = @LIBTOOL@ |
204 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
205 | +Index: mysql-5.0.77/cmd-line-utils/libedit/Makefile.in |
206 | +=================================================================== |
207 | +--- mysql-5.0.77.orig/cmd-line-utils/libedit/Makefile.in |
208 | ++++ mysql-5.0.77/cmd-line-utils/libedit/Makefile.in |
209 | +@@ -175,6 +175,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
210 | + LIBDL = @LIBDL@ |
211 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
212 | + LIBOBJS = @LIBOBJS@ |
213 | ++LIBRT = @LIBRT@ |
214 | + LIBS = @LIBS@ |
215 | + LIBTOOL = @LIBTOOL@ |
216 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
217 | +Index: mysql-5.0.77/cmd-line-utils/readline/Makefile.in |
218 | +=================================================================== |
219 | +--- mysql-5.0.77.orig/cmd-line-utils/readline/Makefile.in |
220 | ++++ mysql-5.0.77/cmd-line-utils/readline/Makefile.in |
221 | +@@ -173,6 +173,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
222 | + LIBDL = @LIBDL@ |
223 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
224 | + LIBOBJS = @LIBOBJS@ |
225 | ++LIBRT = @LIBRT@ |
226 | + LIBS = @LIBS@ |
227 | + LIBTOOL = @LIBTOOL@ |
228 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
229 | +Index: mysql-5.0.77/configure |
230 | +=================================================================== |
231 | +--- mysql-5.0.77.orig/configure |
232 | ++++ mysql-5.0.77/configure |
233 | +@@ -39583,7 +39583,91 @@ case "$target" in |
234 | # We also disable for SCO for the time being, the headers for the |
235 | # thread library we use conflicts with other headers. |
236 | ;; |
237 | @@ -227,7 +237,7 @@ |
238 | for ac_func in clock_gettime |
239 | do |
240 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
241 | -@@ -42956,7 +43040,7 @@ |
242 | +@@ -42956,7 +43040,7 @@ _ACEOF |
243 | |
244 | fi |
245 | |
246 | @@ -236,10 +246,11 @@ |
247 | |
248 | |
249 | |
250 | -diff -r 23e5576aa59a configure.in |
251 | ---- a/configure.in Tue Feb 17 22:33:00 2009 -0800 |
252 | -+++ b/configure.in Tue Feb 17 22:33:23 2009 -0800 |
253 | -@@ -2098,7 +2098,18 @@ |
254 | +Index: mysql-5.0.77/configure.in |
255 | +=================================================================== |
256 | +--- mysql-5.0.77.orig/configure.in |
257 | ++++ mysql-5.0.77/configure.in |
258 | +@@ -2098,7 +2098,18 @@ case "$target" in |
259 | # We also disable for SCO for the time being, the headers for the |
260 | # thread library we use conflicts with other headers. |
261 | ;; |
262 | @@ -259,7 +270,7 @@ |
263 | ;; |
264 | esac |
265 | |
266 | -@@ -2713,7 +2724,7 @@ |
267 | +@@ -2713,7 +2724,7 @@ else |
268 | AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe]) |
269 | fi |
270 | |
271 | @@ -268,131 +279,143 @@ |
272 | |
273 | AC_SUBST(CLIENT_LIBS) |
274 | AC_SUBST(NON_THREADED_LIBS) |
275 | -diff -r 23e5576aa59a dbug/Makefile.in |
276 | ---- a/dbug/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
277 | -+++ b/dbug/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
278 | -@@ -192,6 +192,7 @@ |
279 | - LIBDL = @LIBDL@ |
280 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
281 | - LIBOBJS = @LIBOBJS@ |
282 | -+LIBRT = @LIBRT@ |
283 | - LIBS = @LIBS@ |
284 | - LIBTOOL = @LIBTOOL@ |
285 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
286 | -diff -r 23e5576aa59a extra/Makefile.in |
287 | ---- a/extra/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
288 | -+++ b/extra/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
289 | -@@ -240,6 +240,7 @@ |
290 | - LIBDL = @LIBDL@ |
291 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
292 | - LIBOBJS = @LIBOBJS@ |
293 | -+LIBRT = @LIBRT@ |
294 | - LIBS = @LIBS@ |
295 | - LIBTOOL = @LIBTOOL@ |
296 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
297 | -diff -r 23e5576aa59a extra/yassl/Makefile.in |
298 | ---- a/extra/yassl/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
299 | -+++ b/extra/yassl/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
300 | -@@ -142,6 +142,7 @@ |
301 | - LIBDL = @LIBDL@ |
302 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
303 | - LIBOBJS = @LIBOBJS@ |
304 | -+LIBRT = @LIBRT@ |
305 | - LIBS = @LIBS@ |
306 | - LIBTOOL = @LIBTOOL@ |
307 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
308 | -diff -r 23e5576aa59a extra/yassl/src/Makefile.in |
309 | ---- a/extra/yassl/src/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
310 | -+++ b/extra/yassl/src/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
311 | -@@ -151,6 +151,7 @@ |
312 | - LIBDL = @LIBDL@ |
313 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
314 | - LIBOBJS = @LIBOBJS@ |
315 | -+LIBRT = @LIBRT@ |
316 | - LIBS = @LIBS@ |
317 | - LIBTOOL = @LIBTOOL@ |
318 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
319 | -diff -r 23e5576aa59a extra/yassl/taocrypt/Makefile.in |
320 | ---- a/extra/yassl/taocrypt/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
321 | -+++ b/extra/yassl/taocrypt/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
322 | -@@ -142,6 +142,7 @@ |
323 | - LIBDL = @LIBDL@ |
324 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
325 | - LIBOBJS = @LIBOBJS@ |
326 | -+LIBRT = @LIBRT@ |
327 | - LIBS = @LIBS@ |
328 | - LIBTOOL = @LIBTOOL@ |
329 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
330 | -diff -r 23e5576aa59a extra/yassl/taocrypt/benchmark/Makefile.in |
331 | ---- a/extra/yassl/taocrypt/benchmark/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
332 | -+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
333 | -@@ -153,6 +153,7 @@ |
334 | - LIBDL = @LIBDL@ |
335 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
336 | - LIBOBJS = @LIBOBJS@ |
337 | -+LIBRT = @LIBRT@ |
338 | - LIBS = @LIBS@ |
339 | - LIBTOOL = @LIBTOOL@ |
340 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
341 | -diff -r 23e5576aa59a extra/yassl/taocrypt/src/Makefile.in |
342 | ---- a/extra/yassl/taocrypt/src/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
343 | -+++ b/extra/yassl/taocrypt/src/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
344 | -@@ -164,6 +164,7 @@ |
345 | - LIBDL = @LIBDL@ |
346 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
347 | - LIBOBJS = @LIBOBJS@ |
348 | -+LIBRT = @LIBRT@ |
349 | - LIBS = @LIBS@ |
350 | - LIBTOOL = @LIBTOOL@ |
351 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
352 | -diff -r 23e5576aa59a extra/yassl/taocrypt/test/Makefile.in |
353 | ---- a/extra/yassl/taocrypt/test/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
354 | -+++ b/extra/yassl/taocrypt/test/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
355 | -@@ -153,6 +153,7 @@ |
356 | - LIBDL = @LIBDL@ |
357 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
358 | - LIBOBJS = @LIBOBJS@ |
359 | -+LIBRT = @LIBRT@ |
360 | - LIBS = @LIBS@ |
361 | - LIBTOOL = @LIBTOOL@ |
362 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
363 | -diff -r 23e5576aa59a extra/yassl/testsuite/Makefile.in |
364 | ---- a/extra/yassl/testsuite/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
365 | -+++ b/extra/yassl/testsuite/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
366 | -@@ -156,6 +156,7 @@ |
367 | - LIBDL = @LIBDL@ |
368 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
369 | - LIBOBJS = @LIBOBJS@ |
370 | -+LIBRT = @LIBRT@ |
371 | - LIBS = @LIBS@ |
372 | - LIBTOOL = @LIBTOOL@ |
373 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
374 | -diff -r 23e5576aa59a heap/Makefile.in |
375 | ---- a/heap/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
376 | -+++ b/heap/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
377 | -@@ -202,6 +202,7 @@ |
378 | - LIBDL = @LIBDL@ |
379 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
380 | - LIBOBJS = @LIBOBJS@ |
381 | -+LIBRT = @LIBRT@ |
382 | - LIBS = @LIBS@ |
383 | - LIBTOOL = @LIBTOOL@ |
384 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
385 | -diff -r 23e5576aa59a include/Makefile.in |
386 | ---- a/include/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
387 | -+++ b/include/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
388 | -@@ -160,6 +160,7 @@ |
389 | - LIBDL = @LIBDL@ |
390 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
391 | - LIBOBJS = @LIBOBJS@ |
392 | -+LIBRT = @LIBRT@ |
393 | - LIBS = @LIBS@ |
394 | - LIBTOOL = @LIBTOOL@ |
395 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
396 | -diff -r 23e5576aa59a include/mysql_com.h |
397 | ---- a/include/mysql_com.h Tue Feb 17 22:33:00 2009 -0800 |
398 | -+++ b/include/mysql_com.h Tue Feb 17 22:33:23 2009 -0800 |
399 | -@@ -106,6 +106,11 @@ |
400 | +Index: mysql-5.0.77/dbug/Makefile.in |
401 | +=================================================================== |
402 | +--- mysql-5.0.77.orig/dbug/Makefile.in |
403 | ++++ mysql-5.0.77/dbug/Makefile.in |
404 | +@@ -192,6 +192,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
405 | + LIBDL = @LIBDL@ |
406 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
407 | + LIBOBJS = @LIBOBJS@ |
408 | ++LIBRT = @LIBRT@ |
409 | + LIBS = @LIBS@ |
410 | + LIBTOOL = @LIBTOOL@ |
411 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
412 | +Index: mysql-5.0.77/extra/Makefile.in |
413 | +=================================================================== |
414 | +--- mysql-5.0.77.orig/extra/Makefile.in |
415 | ++++ mysql-5.0.77/extra/Makefile.in |
416 | +@@ -240,6 +240,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
417 | + LIBDL = @LIBDL@ |
418 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
419 | + LIBOBJS = @LIBOBJS@ |
420 | ++LIBRT = @LIBRT@ |
421 | + LIBS = @LIBS@ |
422 | + LIBTOOL = @LIBTOOL@ |
423 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
424 | +Index: mysql-5.0.77/extra/yassl/Makefile.in |
425 | +=================================================================== |
426 | +--- mysql-5.0.77.orig/extra/yassl/Makefile.in |
427 | ++++ mysql-5.0.77/extra/yassl/Makefile.in |
428 | +@@ -142,6 +142,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
429 | + LIBDL = @LIBDL@ |
430 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
431 | + LIBOBJS = @LIBOBJS@ |
432 | ++LIBRT = @LIBRT@ |
433 | + LIBS = @LIBS@ |
434 | + LIBTOOL = @LIBTOOL@ |
435 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
436 | +Index: mysql-5.0.77/extra/yassl/src/Makefile.in |
437 | +=================================================================== |
438 | +--- mysql-5.0.77.orig/extra/yassl/src/Makefile.in |
439 | ++++ mysql-5.0.77/extra/yassl/src/Makefile.in |
440 | +@@ -151,6 +151,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
441 | + LIBDL = @LIBDL@ |
442 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
443 | + LIBOBJS = @LIBOBJS@ |
444 | ++LIBRT = @LIBRT@ |
445 | + LIBS = @LIBS@ |
446 | + LIBTOOL = @LIBTOOL@ |
447 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
448 | +Index: mysql-5.0.77/extra/yassl/taocrypt/Makefile.in |
449 | +=================================================================== |
450 | +--- mysql-5.0.77.orig/extra/yassl/taocrypt/Makefile.in |
451 | ++++ mysql-5.0.77/extra/yassl/taocrypt/Makefile.in |
452 | +@@ -142,6 +142,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
453 | + LIBDL = @LIBDL@ |
454 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
455 | + LIBOBJS = @LIBOBJS@ |
456 | ++LIBRT = @LIBRT@ |
457 | + LIBS = @LIBS@ |
458 | + LIBTOOL = @LIBTOOL@ |
459 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
460 | +Index: mysql-5.0.77/extra/yassl/taocrypt/benchmark/Makefile.in |
461 | +=================================================================== |
462 | +--- mysql-5.0.77.orig/extra/yassl/taocrypt/benchmark/Makefile.in |
463 | ++++ mysql-5.0.77/extra/yassl/taocrypt/benchmark/Makefile.in |
464 | +@@ -153,6 +153,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
465 | + LIBDL = @LIBDL@ |
466 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
467 | + LIBOBJS = @LIBOBJS@ |
468 | ++LIBRT = @LIBRT@ |
469 | + LIBS = @LIBS@ |
470 | + LIBTOOL = @LIBTOOL@ |
471 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
472 | +Index: mysql-5.0.77/extra/yassl/taocrypt/src/Makefile.in |
473 | +=================================================================== |
474 | +--- mysql-5.0.77.orig/extra/yassl/taocrypt/src/Makefile.in |
475 | ++++ mysql-5.0.77/extra/yassl/taocrypt/src/Makefile.in |
476 | +@@ -164,6 +164,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
477 | + LIBDL = @LIBDL@ |
478 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
479 | + LIBOBJS = @LIBOBJS@ |
480 | ++LIBRT = @LIBRT@ |
481 | + LIBS = @LIBS@ |
482 | + LIBTOOL = @LIBTOOL@ |
483 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
484 | +Index: mysql-5.0.77/extra/yassl/taocrypt/test/Makefile.in |
485 | +=================================================================== |
486 | +--- mysql-5.0.77.orig/extra/yassl/taocrypt/test/Makefile.in |
487 | ++++ mysql-5.0.77/extra/yassl/taocrypt/test/Makefile.in |
488 | +@@ -153,6 +153,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
489 | + LIBDL = @LIBDL@ |
490 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
491 | + LIBOBJS = @LIBOBJS@ |
492 | ++LIBRT = @LIBRT@ |
493 | + LIBS = @LIBS@ |
494 | + LIBTOOL = @LIBTOOL@ |
495 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
496 | +Index: mysql-5.0.77/extra/yassl/testsuite/Makefile.in |
497 | +=================================================================== |
498 | +--- mysql-5.0.77.orig/extra/yassl/testsuite/Makefile.in |
499 | ++++ mysql-5.0.77/extra/yassl/testsuite/Makefile.in |
500 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
501 | + LIBDL = @LIBDL@ |
502 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
503 | + LIBOBJS = @LIBOBJS@ |
504 | ++LIBRT = @LIBRT@ |
505 | + LIBS = @LIBS@ |
506 | + LIBTOOL = @LIBTOOL@ |
507 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
508 | +Index: mysql-5.0.77/heap/Makefile.in |
509 | +=================================================================== |
510 | +--- mysql-5.0.77.orig/heap/Makefile.in |
511 | ++++ mysql-5.0.77/heap/Makefile.in |
512 | +@@ -202,6 +202,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
513 | + LIBDL = @LIBDL@ |
514 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
515 | + LIBOBJS = @LIBOBJS@ |
516 | ++LIBRT = @LIBRT@ |
517 | + LIBS = @LIBS@ |
518 | + LIBTOOL = @LIBTOOL@ |
519 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
520 | +Index: mysql-5.0.77/include/Makefile.in |
521 | +=================================================================== |
522 | +--- mysql-5.0.77.orig/include/Makefile.in |
523 | ++++ mysql-5.0.77/include/Makefile.in |
524 | +@@ -160,6 +160,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
525 | + LIBDL = @LIBDL@ |
526 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
527 | + LIBOBJS = @LIBOBJS@ |
528 | ++LIBRT = @LIBRT@ |
529 | + LIBS = @LIBS@ |
530 | + LIBTOOL = @LIBTOOL@ |
531 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
532 | +Index: mysql-5.0.77/include/mysql_com.h |
533 | +=================================================================== |
534 | +--- mysql-5.0.77.orig/include/mysql_com.h |
535 | ++++ mysql-5.0.77/include/mysql_com.h |
536 | +@@ -106,6 +106,11 @@ enum enum_server_command |
537 | thread */ |
538 | #define REFRESH_MASTER 128 /* Remove all bin logs in the index |
539 | and truncate the index */ |
540 | @@ -404,10 +427,11 @@ |
541 | |
542 | /* The following can't be set with mysql_refresh() */ |
543 | #define REFRESH_READ_LOCK 16384 /* Lock tables for read */ |
544 | -diff -r 23e5576aa59a libmysql/Makefile.in |
545 | ---- a/libmysql/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
546 | -+++ b/libmysql/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
547 | -@@ -224,6 +224,7 @@ |
548 | +Index: mysql-5.0.77/libmysql/Makefile.in |
549 | +=================================================================== |
550 | +--- mysql-5.0.77.orig/libmysql/Makefile.in |
551 | ++++ mysql-5.0.77/libmysql/Makefile.in |
552 | +@@ -224,6 +224,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
553 | LIBDL = @LIBDL@ |
554 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
555 | LIBOBJS = @LIBOBJS@ |
556 | @@ -415,10 +439,11 @@ |
557 | LIBS = @CLIENT_LIBS@ |
558 | LIBTOOL = @LIBTOOL@ |
559 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
560 | -diff -r 23e5576aa59a libmysql_r/Makefile.in |
561 | ---- a/libmysql_r/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
562 | -+++ b/libmysql_r/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
563 | -@@ -221,6 +221,7 @@ |
564 | +Index: mysql-5.0.77/libmysql_r/Makefile.in |
565 | +=================================================================== |
566 | +--- mysql-5.0.77.orig/libmysql_r/Makefile.in |
567 | ++++ mysql-5.0.77/libmysql_r/Makefile.in |
568 | +@@ -221,6 +221,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
569 | LIBDL = @LIBDL@ |
570 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
571 | LIBOBJS = @LIBOBJS@ |
572 | @@ -426,10 +451,11 @@ |
573 | LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ |
574 | LIBTOOL = @LIBTOOL@ |
575 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
576 | -diff -r 23e5576aa59a libmysqld/Makefile.in |
577 | ---- a/libmysqld/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
578 | -+++ b/libmysqld/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
579 | -@@ -246,6 +246,7 @@ |
580 | +Index: mysql-5.0.77/libmysqld/Makefile.in |
581 | +=================================================================== |
582 | +--- mysql-5.0.77.orig/libmysqld/Makefile.in |
583 | ++++ mysql-5.0.77/libmysqld/Makefile.in |
584 | +@@ -246,6 +246,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
585 | LIBDL = @LIBDL@ |
586 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
587 | LIBOBJS = @LIBOBJS@ |
588 | @@ -437,10 +463,11 @@ |
589 | LIBS = @LIBS@ |
590 | LIBTOOL = @LIBTOOL@ |
591 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
592 | -diff -r 23e5576aa59a libmysqld/examples/Makefile.in |
593 | ---- a/libmysqld/examples/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
594 | -+++ b/libmysqld/examples/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
595 | -@@ -192,6 +192,7 @@ |
596 | +Index: mysql-5.0.77/libmysqld/examples/Makefile.in |
597 | +=================================================================== |
598 | +--- mysql-5.0.77.orig/libmysqld/examples/Makefile.in |
599 | ++++ mysql-5.0.77/libmysqld/examples/Makefile.in |
600 | +@@ -192,6 +192,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
601 | LIBDL = @LIBDL@ |
602 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
603 | LIBOBJS = @LIBOBJS@ |
604 | @@ -448,65 +475,71 @@ |
605 | LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) |
606 | LIBTOOL = @LIBTOOL@ |
607 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
608 | -diff -r 23e5576aa59a man/Makefile.in |
609 | ---- a/man/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
610 | -+++ b/man/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
611 | -@@ -151,6 +151,7 @@ |
612 | - LIBDL = @LIBDL@ |
613 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
614 | - LIBOBJS = @LIBOBJS@ |
615 | -+LIBRT = @LIBRT@ |
616 | - LIBS = @LIBS@ |
617 | - LIBTOOL = @LIBTOOL@ |
618 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
619 | -diff -r 23e5576aa59a myisam/Makefile.in |
620 | ---- a/myisam/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
621 | -+++ b/myisam/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
622 | -@@ -235,6 +235,7 @@ |
623 | - LIBDL = @LIBDL@ |
624 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
625 | - LIBOBJS = @LIBOBJS@ |
626 | -+LIBRT = @LIBRT@ |
627 | - LIBS = @LIBS@ |
628 | - LIBTOOL = @LIBTOOL@ |
629 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
630 | -diff -r 23e5576aa59a myisammrg/Makefile.in |
631 | ---- a/myisammrg/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
632 | -+++ b/myisammrg/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
633 | -@@ -183,6 +183,7 @@ |
634 | - LIBDL = @LIBDL@ |
635 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
636 | - LIBOBJS = @LIBOBJS@ |
637 | -+LIBRT = @LIBRT@ |
638 | - LIBS = @LIBS@ |
639 | - LIBTOOL = @LIBTOOL@ |
640 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
641 | -diff -r 23e5576aa59a mysql-test/Makefile.in |
642 | ---- a/mysql-test/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
643 | -+++ b/mysql-test/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
644 | -@@ -161,6 +161,7 @@ |
645 | - LIBDL = @LIBDL@ |
646 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
647 | - LIBOBJS = @LIBOBJS@ |
648 | -+LIBRT = @LIBRT@ |
649 | - LIBS = @LIBS@ |
650 | - LIBTOOL = @LIBTOOL@ |
651 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
652 | -diff -r 23e5576aa59a mysql-test/ndb/Makefile.in |
653 | ---- a/mysql-test/ndb/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
654 | -+++ b/mysql-test/ndb/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
655 | -@@ -147,6 +147,7 @@ |
656 | - LIBDL = @LIBDL@ |
657 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
658 | - LIBOBJS = @LIBOBJS@ |
659 | -+LIBRT = @LIBRT@ |
660 | - LIBS = @LIBS@ |
661 | - LIBTOOL = @LIBTOOL@ |
662 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
663 | -diff -r 23e5576aa59a mysql-test/r/information_schema.result |
664 | ---- a/mysql-test/r/information_schema.result Tue Feb 17 22:33:00 2009 -0800 |
665 | -+++ b/mysql-test/r/information_schema.result Tue Feb 17 22:33:23 2009 -0800 |
666 | -@@ -37,10 +37,12 @@ |
667 | +Index: mysql-5.0.77/man/Makefile.in |
668 | +=================================================================== |
669 | +--- mysql-5.0.77.orig/man/Makefile.in |
670 | ++++ mysql-5.0.77/man/Makefile.in |
671 | +@@ -151,6 +151,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
672 | + LIBDL = @LIBDL@ |
673 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
674 | + LIBOBJS = @LIBOBJS@ |
675 | ++LIBRT = @LIBRT@ |
676 | + LIBS = @LIBS@ |
677 | + LIBTOOL = @LIBTOOL@ |
678 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
679 | +Index: mysql-5.0.77/myisam/Makefile.in |
680 | +=================================================================== |
681 | +--- mysql-5.0.77.orig/myisam/Makefile.in |
682 | ++++ mysql-5.0.77/myisam/Makefile.in |
683 | +@@ -235,6 +235,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
684 | + LIBDL = @LIBDL@ |
685 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
686 | + LIBOBJS = @LIBOBJS@ |
687 | ++LIBRT = @LIBRT@ |
688 | + LIBS = @LIBS@ |
689 | + LIBTOOL = @LIBTOOL@ |
690 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
691 | +Index: mysql-5.0.77/myisammrg/Makefile.in |
692 | +=================================================================== |
693 | +--- mysql-5.0.77.orig/myisammrg/Makefile.in |
694 | ++++ mysql-5.0.77/myisammrg/Makefile.in |
695 | +@@ -183,6 +183,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
696 | + LIBDL = @LIBDL@ |
697 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
698 | + LIBOBJS = @LIBOBJS@ |
699 | ++LIBRT = @LIBRT@ |
700 | + LIBS = @LIBS@ |
701 | + LIBTOOL = @LIBTOOL@ |
702 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
703 | +Index: mysql-5.0.77/mysql-test/Makefile.in |
704 | +=================================================================== |
705 | +--- mysql-5.0.77.orig/mysql-test/Makefile.in |
706 | ++++ mysql-5.0.77/mysql-test/Makefile.in |
707 | +@@ -161,6 +161,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
708 | + LIBDL = @LIBDL@ |
709 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
710 | + LIBOBJS = @LIBOBJS@ |
711 | ++LIBRT = @LIBRT@ |
712 | + LIBS = @LIBS@ |
713 | + LIBTOOL = @LIBTOOL@ |
714 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
715 | +Index: mysql-5.0.77/mysql-test/ndb/Makefile.in |
716 | +=================================================================== |
717 | +--- mysql-5.0.77.orig/mysql-test/ndb/Makefile.in |
718 | ++++ mysql-5.0.77/mysql-test/ndb/Makefile.in |
719 | +@@ -147,6 +147,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
720 | + LIBDL = @LIBDL@ |
721 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
722 | + LIBOBJS = @LIBOBJS@ |
723 | ++LIBRT = @LIBRT@ |
724 | + LIBS = @LIBS@ |
725 | + LIBTOOL = @LIBTOOL@ |
726 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
727 | +Index: mysql-5.0.77/mysql-test/r/information_schema.result |
728 | +=================================================================== |
729 | +--- mysql-5.0.77.orig/mysql-test/r/information_schema.result |
730 | ++++ mysql-5.0.77/mysql-test/r/information_schema.result |
731 | +@@ -37,10 +37,12 @@ create view v1 (c) as select table_name |
732 | select * from v1; |
733 | c |
734 | CHARACTER_SETS |
735 | @@ -519,7 +552,7 @@ |
736 | KEY_COLUMN_USAGE |
737 | PROFILING |
738 | ROUTINES |
739 | -@@ -50,8 +52,10 @@ |
740 | +@@ -50,8 +52,10 @@ STATISTICS |
741 | TABLES |
742 | TABLE_CONSTRAINTS |
743 | TABLE_PRIVILEGES |
744 | @@ -530,31 +563,31 @@ |
745 | VIEWS |
746 | columns_priv |
747 | db |
748 | -@@ -83,6 +87,7 @@ |
749 | - TABLES TABLES |
750 | - TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
751 | - TABLE_PRIVILEGES TABLE_PRIVILEGES |
752 | -+TABLE_STATISTICS TABLE_STATISTICS |
753 | - TRIGGERS TRIGGERS |
754 | - tables_priv tables_priv |
755 | - time_zone time_zone |
756 | -@@ -102,6 +107,7 @@ |
757 | - TABLES TABLES |
758 | - TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
759 | - TABLE_PRIVILEGES TABLE_PRIVILEGES |
760 | -+TABLE_STATISTICS TABLE_STATISTICS |
761 | - TRIGGERS TRIGGERS |
762 | - tables_priv tables_priv |
763 | - time_zone time_zone |
764 | -@@ -121,6 +127,7 @@ |
765 | - TABLES TABLES |
766 | - TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
767 | - TABLE_PRIVILEGES TABLE_PRIVILEGES |
768 | -+TABLE_STATISTICS TABLE_STATISTICS |
769 | - TRIGGERS TRIGGERS |
770 | - tables_priv tables_priv |
771 | - time_zone time_zone |
772 | -@@ -594,12 +601,13 @@ |
773 | +@@ -83,6 +87,7 @@ c table_name |
774 | + TABLES TABLES |
775 | + TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
776 | + TABLE_PRIVILEGES TABLE_PRIVILEGES |
777 | ++TABLE_STATISTICS TABLE_STATISTICS |
778 | + TRIGGERS TRIGGERS |
779 | + tables_priv tables_priv |
780 | + time_zone time_zone |
781 | +@@ -102,6 +107,7 @@ c table_name |
782 | + TABLES TABLES |
783 | + TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
784 | + TABLE_PRIVILEGES TABLE_PRIVILEGES |
785 | ++TABLE_STATISTICS TABLE_STATISTICS |
786 | + TRIGGERS TRIGGERS |
787 | + tables_priv tables_priv |
788 | + time_zone time_zone |
789 | +@@ -121,6 +127,7 @@ c table_name |
790 | + TABLES TABLES |
791 | + TABLE_CONSTRAINTS TABLE_CONSTRAINTS |
792 | + TABLE_PRIVILEGES TABLE_PRIVILEGES |
793 | ++TABLE_STATISTICS TABLE_STATISTICS |
794 | + TRIGGERS TRIGGERS |
795 | + tables_priv tables_priv |
796 | + time_zone time_zone |
797 | +@@ -594,12 +601,13 @@ from information_schema.tables |
798 | where table_schema='information_schema' limit 2; |
799 | TABLE_NAME TABLE_TYPE ENGINE |
800 | CHARACTER_SETS SYSTEM VIEW MEMORY |
801 | @@ -569,7 +602,7 @@ |
802 | TRIGGERS |
803 | create database information_schema; |
804 | ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' |
805 | -@@ -609,6 +617,7 @@ |
806 | +@@ -609,6 +617,7 @@ Tables_in_information_schema (T%) Table_ |
807 | TABLES SYSTEM VIEW |
808 | TABLE_CONSTRAINTS SYSTEM VIEW |
809 | TABLE_PRIVILEGES SYSTEM VIEW |
810 | @@ -577,7 +610,7 @@ |
811 | TRIGGERS SYSTEM VIEW |
812 | create table t1(a int); |
813 | ERROR 42S02: Unknown table 't1' in information_schema |
814 | -@@ -621,6 +630,7 @@ |
815 | +@@ -621,6 +630,7 @@ Tables_in_information_schema (T%) |
816 | TABLES |
817 | TABLE_CONSTRAINTS |
818 | TABLE_PRIVILEGES |
819 | @@ -585,7 +618,7 @@ |
820 | TRIGGERS |
821 | select table_name from tables where table_name='user'; |
822 | table_name |
823 | -@@ -730,7 +740,7 @@ |
824 | +@@ -730,7 +740,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); |
825 | CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; |
826 | CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; |
827 | count(*) |
828 | @@ -594,7 +627,7 @@ |
829 | drop view a2, a1; |
830 | drop table t_crashme; |
831 | select table_schema,table_name, column_name from |
832 | -@@ -790,18 +800,20 @@ |
833 | +@@ -790,18 +800,20 @@ where COLUMN_NAME='TABLE_NAME'; |
834 | TABLE_NAME COLUMN_NAME PRIVILEGES |
835 | COLUMNS TABLE_NAME select |
836 | COLUMN_PRIVILEGES TABLE_NAME select |
837 | @@ -616,7 +649,7 @@ |
838 | mysql 17 |
839 | create table t1 (i int, j int); |
840 | create trigger trg1 before insert on t1 for each row |
841 | -@@ -1187,10 +1199,12 @@ |
842 | +@@ -1187,10 +1199,12 @@ c2.column_name LIKE '%SCHEMA%' |
843 | ); |
844 | table_name column_name |
845 | CHARACTER_SETS CHARACTER_SET_NAME |
846 | @@ -629,7 +662,7 @@ |
847 | KEY_COLUMN_USAGE CONSTRAINT_SCHEMA |
848 | PROFILING QUERY_ID |
849 | ROUTINES ROUTINE_SCHEMA |
850 | -@@ -1200,8 +1214,10 @@ |
851 | +@@ -1200,8 +1214,10 @@ STATISTICS TABLE_SCHEMA |
852 | TABLES TABLE_SCHEMA |
853 | TABLE_CONSTRAINTS CONSTRAINT_SCHEMA |
854 | TABLE_PRIVILEGES TABLE_SCHEMA |
855 | @@ -640,7 +673,7 @@ |
856 | VIEWS TABLE_SCHEMA |
857 | SELECT t.table_name, c1.column_name |
858 | FROM information_schema.tables t |
859 | -@@ -1219,10 +1235,12 @@ |
860 | +@@ -1219,10 +1235,12 @@ c2.column_name LIKE '%SCHEMA%' |
861 | ); |
862 | table_name column_name |
863 | CHARACTER_SETS CHARACTER_SET_NAME |
864 | @@ -653,7 +686,7 @@ |
865 | KEY_COLUMN_USAGE CONSTRAINT_SCHEMA |
866 | PROFILING QUERY_ID |
867 | ROUTINES ROUTINE_SCHEMA |
868 | -@@ -1232,8 +1250,10 @@ |
869 | +@@ -1232,8 +1250,10 @@ STATISTICS TABLE_SCHEMA |
870 | TABLES TABLE_SCHEMA |
871 | TABLE_CONSTRAINTS CONSTRAINT_SCHEMA |
872 | TABLE_PRIVILEGES TABLE_SCHEMA |
873 | @@ -664,7 +697,7 @@ |
874 | VIEWS TABLE_SCHEMA |
875 | SELECT MAX(table_name) FROM information_schema.tables; |
876 | MAX(table_name) |
877 | -@@ -1302,10 +1322,12 @@ |
878 | +@@ -1302,10 +1322,12 @@ group by c2.column_type order by num lim |
879 | group by t.table_name order by num1, t.table_name; |
880 | table_name group_concat(t.table_schema, '.', t.table_name) num1 |
881 | CHARACTER_SETS information_schema.CHARACTER_SETS 1 |
882 | @@ -677,7 +710,7 @@ |
883 | KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 |
884 | PROFILING information_schema.PROFILING 1 |
885 | ROUTINES information_schema.ROUTINES 1 |
886 | -@@ -1315,8 +1337,10 @@ |
887 | +@@ -1315,8 +1337,10 @@ STATISTICS information_schema.STATISTICS |
888 | TABLES information_schema.TABLES 1 |
889 | TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1 |
890 | TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1 |
891 | @@ -688,10 +721,11 @@ |
892 | VIEWS information_schema.VIEWS 1 |
893 | show global status like "Uptime_%"; |
894 | Variable_name Value |
895 | -diff -r 23e5576aa59a mysql-test/r/information_schema_db.result |
896 | ---- a/mysql-test/r/information_schema_db.result Tue Feb 17 22:33:00 2009 -0800 |
897 | -+++ b/mysql-test/r/information_schema_db.result Tue Feb 17 22:33:23 2009 -0800 |
898 | -@@ -6,10 +6,12 @@ |
899 | +Index: mysql-5.0.77/mysql-test/r/information_schema_db.result |
900 | +=================================================================== |
901 | +--- mysql-5.0.77.orig/mysql-test/r/information_schema_db.result |
902 | ++++ mysql-5.0.77/mysql-test/r/information_schema_db.result |
903 | +@@ -6,10 +6,12 @@ use INFORMATION_SCHEMA; |
904 | show tables; |
905 | Tables_in_information_schema |
906 | CHARACTER_SETS |
907 | @@ -704,7 +738,7 @@ |
908 | KEY_COLUMN_USAGE |
909 | PROFILING |
910 | ROUTINES |
911 | -@@ -19,14 +21,17 @@ |
912 | +@@ -19,14 +21,17 @@ STATISTICS |
913 | TABLES |
914 | TABLE_CONSTRAINTS |
915 | TABLE_PRIVILEGES |
916 | @@ -722,10 +756,11 @@ |
917 | TRIGGERS |
918 | create database `inf%`; |
919 | create database mbase; |
920 | -diff -r 23e5576aa59a mysql-test/r/mysqlshow.result |
921 | ---- a/mysql-test/r/mysqlshow.result Tue Feb 17 22:33:00 2009 -0800 |
922 | -+++ b/mysql-test/r/mysqlshow.result Tue Feb 17 22:33:23 2009 -0800 |
923 | -@@ -80,10 +80,12 @@ |
924 | +Index: mysql-5.0.77/mysql-test/r/mysqlshow.result |
925 | +=================================================================== |
926 | +--- mysql-5.0.77.orig/mysql-test/r/mysqlshow.result |
927 | ++++ mysql-5.0.77/mysql-test/r/mysqlshow.result |
928 | +@@ -80,10 +80,12 @@ Database: information_schema |
929 | | Tables | |
930 | +---------------------------------------+ |
931 | | CHARACTER_SETS | |
932 | @@ -738,7 +773,7 @@ |
933 | | KEY_COLUMN_USAGE | |
934 | | PROFILING | |
935 | | ROUTINES | |
936 | -@@ -93,8 +95,10 @@ |
937 | +@@ -93,8 +95,10 @@ Database: information_schema |
938 | | TABLES | |
939 | | TABLE_CONSTRAINTS | |
940 | | TABLE_PRIVILEGES | |
941 | @@ -749,7 +784,7 @@ |
942 | | VIEWS | |
943 | +---------------------------------------+ |
944 | Database: INFORMATION_SCHEMA |
945 | -@@ -102,10 +106,12 @@ |
946 | +@@ -102,10 +106,12 @@ Database: INFORMATION_SCHEMA |
947 | | Tables | |
948 | +---------------------------------------+ |
949 | | CHARACTER_SETS | |
950 | @@ -762,7 +797,7 @@ |
951 | | KEY_COLUMN_USAGE | |
952 | | PROFILING | |
953 | | ROUTINES | |
954 | -@@ -115,8 +121,10 @@ |
955 | +@@ -115,8 +121,10 @@ Database: INFORMATION_SCHEMA |
956 | | TABLES | |
957 | | TABLE_CONSTRAINTS | |
958 | | TABLE_PRIVILEGES | |
959 | @@ -773,548 +808,598 @@ |
960 | | VIEWS | |
961 | +---------------------------------------+ |
962 | Wildcard: inf_rmation_schema |
963 | -diff -r 23e5576aa59a mysys/Makefile.in |
964 | ---- a/mysys/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
965 | -+++ b/mysys/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
966 | -@@ -228,6 +228,7 @@ |
967 | - LIBDL = @LIBDL@ |
968 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
969 | - LIBOBJS = @LIBOBJS@ |
970 | -+LIBRT = @LIBRT@ |
971 | - LIBS = @LIBS@ |
972 | - LIBTOOL = @LIBTOOL@ |
973 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
974 | -diff -r 23e5576aa59a ndb/Makefile.in |
975 | ---- a/ndb/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
976 | -+++ b/ndb/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
977 | -@@ -171,6 +171,7 @@ |
978 | - LIBDL = @LIBDL@ |
979 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
980 | - LIBOBJS = @LIBOBJS@ |
981 | -+LIBRT = @LIBRT@ |
982 | - LIBS = @LIBS@ |
983 | - LIBTOOL = @LIBTOOL@ |
984 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
985 | -diff -r 23e5576aa59a ndb/docs/Makefile.in |
986 | ---- a/ndb/docs/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
987 | -+++ b/ndb/docs/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
988 | -@@ -149,6 +149,7 @@ |
989 | - LIBDL = @LIBDL@ |
990 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
991 | - LIBOBJS = @LIBOBJS@ |
992 | -+LIBRT = @LIBRT@ |
993 | - LIBS = @LIBS@ |
994 | - LIBTOOL = @LIBTOOL@ |
995 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
996 | -diff -r 23e5576aa59a ndb/include/Makefile.in |
997 | ---- a/ndb/include/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
998 | -+++ b/ndb/include/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
999 | -@@ -179,6 +179,7 @@ |
1000 | - LIBDL = @LIBDL@ |
1001 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1002 | - LIBOBJS = @LIBOBJS@ |
1003 | -+LIBRT = @LIBRT@ |
1004 | - LIBS = @LIBS@ |
1005 | - LIBTOOL = @LIBTOOL@ |
1006 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1007 | -diff -r 23e5576aa59a ndb/src/Makefile.in |
1008 | ---- a/ndb/src/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1009 | -+++ b/ndb/src/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1010 | -@@ -204,6 +204,7 @@ |
1011 | - LIBDL = @LIBDL@ |
1012 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1013 | - LIBOBJS = @LIBOBJS@ |
1014 | -+LIBRT = @LIBRT@ |
1015 | - LIBS = @LIBS@ |
1016 | - LIBTOOL = @LIBTOOL@ |
1017 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1018 | -diff -r 23e5576aa59a ndb/src/common/Makefile.in |
1019 | ---- a/ndb/src/common/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1020 | -+++ b/ndb/src/common/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1021 | -@@ -174,6 +174,7 @@ |
1022 | - LIBDL = @LIBDL@ |
1023 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1024 | - LIBOBJS = @LIBOBJS@ |
1025 | -+LIBRT = @LIBRT@ |
1026 | - LIBS = @LIBS@ |
1027 | - LIBTOOL = @LIBTOOL@ |
1028 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1029 | -diff -r 23e5576aa59a ndb/src/common/debugger/Makefile.in |
1030 | ---- a/ndb/src/common/debugger/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1031 | -+++ b/ndb/src/common/debugger/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1032 | -@@ -206,6 +206,7 @@ |
1033 | - LIBDL = @LIBDL@ |
1034 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1035 | - LIBOBJS = @LIBOBJS@ |
1036 | -+LIBRT = @LIBRT@ |
1037 | - LIBS = @LIBS@ |
1038 | - LIBTOOL = @LIBTOOL@ |
1039 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1040 | -diff -r 23e5576aa59a ndb/src/common/debugger/signaldata/Makefile.in |
1041 | ---- a/ndb/src/common/debugger/signaldata/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1042 | -+++ b/ndb/src/common/debugger/signaldata/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1043 | -@@ -211,6 +211,7 @@ |
1044 | - LIBDL = @LIBDL@ |
1045 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1046 | - LIBOBJS = @LIBOBJS@ |
1047 | -+LIBRT = @LIBRT@ |
1048 | - LIBS = @LIBS@ |
1049 | - LIBTOOL = @LIBTOOL@ |
1050 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1051 | -diff -r 23e5576aa59a ndb/src/common/logger/Makefile.in |
1052 | ---- a/ndb/src/common/logger/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1053 | -+++ b/ndb/src/common/logger/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1054 | -@@ -197,6 +197,7 @@ |
1055 | - LIBDL = @LIBDL@ |
1056 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1057 | - LIBOBJS = @LIBOBJS@ |
1058 | -+LIBRT = @LIBRT@ |
1059 | - LIBS = @LIBS@ |
1060 | - LIBTOOL = @LIBTOOL@ |
1061 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1062 | -diff -r 23e5576aa59a ndb/src/common/mgmcommon/Makefile.in |
1063 | ---- a/ndb/src/common/mgmcommon/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1064 | -+++ b/ndb/src/common/mgmcommon/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1065 | -@@ -211,6 +211,7 @@ |
1066 | - LIBDL = @LIBDL@ |
1067 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1068 | - LIBOBJS = @LIBOBJS@ |
1069 | -+LIBRT = @LIBRT@ |
1070 | - LIBS = @LIBS@ |
1071 | - LIBTOOL = @LIBTOOL@ |
1072 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1073 | -diff -r 23e5576aa59a ndb/src/common/portlib/Makefile.in |
1074 | ---- a/ndb/src/common/portlib/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1075 | -+++ b/ndb/src/common/portlib/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1076 | -@@ -222,6 +222,7 @@ |
1077 | - LIBDL = @LIBDL@ |
1078 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1079 | - LIBOBJS = @LIBOBJS@ |
1080 | -+LIBRT = @LIBRT@ |
1081 | - LIBS = @LIBS@ |
1082 | - LIBTOOL = @LIBTOOL@ |
1083 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1084 | -diff -r 23e5576aa59a ndb/src/common/transporter/Makefile.in |
1085 | ---- a/ndb/src/common/transporter/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1086 | -+++ b/ndb/src/common/transporter/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1087 | -@@ -197,6 +197,7 @@ |
1088 | - LIBDL = @LIBDL@ |
1089 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1090 | - LIBOBJS = @LIBOBJS@ |
1091 | -+LIBRT = @LIBRT@ |
1092 | - LIBS = @LIBS@ |
1093 | - LIBTOOL = @LIBTOOL@ |
1094 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1095 | -diff -r 23e5576aa59a ndb/src/common/util/Makefile.in |
1096 | ---- a/ndb/src/common/util/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1097 | -+++ b/ndb/src/common/util/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1098 | -@@ -217,6 +217,7 @@ |
1099 | - LIBDL = @LIBDL@ |
1100 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1101 | - LIBOBJS = @LIBOBJS@ |
1102 | -+LIBRT = @LIBRT@ |
1103 | - LIBS = @LIBS@ |
1104 | - LIBTOOL = @LIBTOOL@ |
1105 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1106 | -diff -r 23e5576aa59a ndb/src/cw/Makefile.in |
1107 | ---- a/ndb/src/cw/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1108 | -+++ b/ndb/src/cw/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1109 | -@@ -156,6 +156,7 @@ |
1110 | - LIBDL = @LIBDL@ |
1111 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1112 | - LIBOBJS = @LIBOBJS@ |
1113 | -+LIBRT = @LIBRT@ |
1114 | - LIBS = @LIBS@ |
1115 | - LIBTOOL = @LIBTOOL@ |
1116 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1117 | -diff -r 23e5576aa59a ndb/src/cw/cpcd/Makefile.in |
1118 | ---- a/ndb/src/cw/cpcd/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1119 | -+++ b/ndb/src/cw/cpcd/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1120 | -@@ -207,6 +207,7 @@ |
1121 | - LIBDL = @LIBDL@ |
1122 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1123 | - LIBOBJS = @LIBOBJS@ |
1124 | -+LIBRT = @LIBRT@ |
1125 | - LIBS = @LIBS@ |
1126 | - LIBTOOL = @LIBTOOL@ |
1127 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1128 | -diff -r 23e5576aa59a ndb/src/kernel/Makefile.in |
1129 | ---- a/ndb/src/kernel/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1130 | -+++ b/ndb/src/kernel/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1131 | -@@ -227,6 +227,7 @@ |
1132 | - LIBDL = @LIBDL@ |
1133 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1134 | - LIBOBJS = @LIBOBJS@ |
1135 | -+LIBRT = @LIBRT@ |
1136 | - LIBS = @LIBS@ |
1137 | - LIBTOOL = @LIBTOOL@ |
1138 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1139 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/Makefile.in |
1140 | ---- a/ndb/src/kernel/blocks/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1141 | -+++ b/ndb/src/kernel/blocks/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1142 | -@@ -156,6 +156,7 @@ |
1143 | - LIBDL = @LIBDL@ |
1144 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1145 | - LIBOBJS = @LIBOBJS@ |
1146 | -+LIBRT = @LIBRT@ |
1147 | - LIBS = @LIBS@ |
1148 | - LIBTOOL = @LIBTOOL@ |
1149 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1150 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/backup/Makefile.in |
1151 | ---- a/ndb/src/kernel/blocks/backup/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1152 | -+++ b/ndb/src/kernel/blocks/backup/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1153 | -@@ -196,6 +196,7 @@ |
1154 | - LIBDL = @LIBDL@ |
1155 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1156 | - LIBOBJS = @LIBOBJS@ |
1157 | -+LIBRT = @LIBRT@ |
1158 | - LIBS = @LIBS@ |
1159 | - LIBTOOL = @LIBTOOL@ |
1160 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1161 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/cmvmi/Makefile.in |
1162 | ---- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1163 | -+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1164 | -@@ -196,6 +196,7 @@ |
1165 | - LIBDL = @LIBDL@ |
1166 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1167 | - LIBOBJS = @LIBOBJS@ |
1168 | -+LIBRT = @LIBRT@ |
1169 | - LIBS = @LIBS@ |
1170 | - LIBTOOL = @LIBTOOL@ |
1171 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1172 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbacc/Makefile.in |
1173 | ---- a/ndb/src/kernel/blocks/dbacc/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1174 | -+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1175 | -@@ -196,6 +196,7 @@ |
1176 | - LIBDL = @LIBDL@ |
1177 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1178 | - LIBOBJS = @LIBOBJS@ |
1179 | -+LIBRT = @LIBRT@ |
1180 | - LIBS = @LIBS@ |
1181 | - LIBTOOL = @LIBTOOL@ |
1182 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1183 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbdict/Makefile.in |
1184 | ---- a/ndb/src/kernel/blocks/dbdict/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1185 | -+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1186 | -@@ -206,6 +206,7 @@ |
1187 | - LIBDL = @LIBDL@ |
1188 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1189 | - LIBOBJS = @LIBOBJS@ |
1190 | -+LIBRT = @LIBRT@ |
1191 | - LIBS = @LIBS@ |
1192 | - LIBTOOL = @LIBTOOL@ |
1193 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1194 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbdih/Makefile.in |
1195 | ---- a/ndb/src/kernel/blocks/dbdih/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1196 | -+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1197 | -@@ -203,6 +203,7 @@ |
1198 | - LIBDL = @LIBDL@ |
1199 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1200 | - LIBOBJS = @LIBOBJS@ |
1201 | -+LIBRT = @LIBRT@ |
1202 | - LIBS = @LIBS@ |
1203 | - LIBTOOL = @LIBTOOL@ |
1204 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1205 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dblqh/Makefile.in |
1206 | ---- a/ndb/src/kernel/blocks/dblqh/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1207 | -+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1208 | -@@ -204,6 +204,7 @@ |
1209 | - LIBDL = @LIBDL@ |
1210 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1211 | - LIBOBJS = @LIBOBJS@ |
1212 | -+LIBRT = @LIBRT@ |
1213 | - LIBS = @LIBS@ |
1214 | - LIBTOOL = @LIBTOOL@ |
1215 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1216 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbtc/Makefile.in |
1217 | ---- a/ndb/src/kernel/blocks/dbtc/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1218 | -+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1219 | -@@ -196,6 +196,7 @@ |
1220 | - LIBDL = @LIBDL@ |
1221 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1222 | - LIBOBJS = @LIBOBJS@ |
1223 | -+LIBRT = @LIBRT@ |
1224 | - LIBS = @LIBS@ |
1225 | - LIBTOOL = @LIBTOOL@ |
1226 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1227 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbtup/Makefile.in |
1228 | ---- a/ndb/src/kernel/blocks/dbtup/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1229 | -+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1230 | -@@ -204,6 +204,7 @@ |
1231 | - LIBDL = @LIBDL@ |
1232 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1233 | - LIBOBJS = @LIBOBJS@ |
1234 | -+LIBRT = @LIBRT@ |
1235 | - LIBS = @LIBS@ |
1236 | - LIBTOOL = @LIBTOOL@ |
1237 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1238 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbtux/Makefile.in |
1239 | ---- a/ndb/src/kernel/blocks/dbtux/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1240 | -+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1241 | -@@ -199,6 +199,7 @@ |
1242 | - LIBDL = @LIBDL@ |
1243 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1244 | - LIBOBJS = @LIBOBJS@ |
1245 | -+LIBRT = @LIBRT@ |
1246 | - LIBS = @LIBS@ |
1247 | - LIBTOOL = @LIBTOOL@ |
1248 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1249 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/dbutil/Makefile.in |
1250 | ---- a/ndb/src/kernel/blocks/dbutil/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1251 | -+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1252 | -@@ -196,6 +196,7 @@ |
1253 | - LIBDL = @LIBDL@ |
1254 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1255 | - LIBOBJS = @LIBOBJS@ |
1256 | -+LIBRT = @LIBRT@ |
1257 | - LIBS = @LIBS@ |
1258 | - LIBTOOL = @LIBTOOL@ |
1259 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1260 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/ndbcntr/Makefile.in |
1261 | ---- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1262 | -+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1263 | -@@ -197,6 +197,7 @@ |
1264 | - LIBDL = @LIBDL@ |
1265 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1266 | - LIBOBJS = @LIBOBJS@ |
1267 | -+LIBRT = @LIBRT@ |
1268 | - LIBS = @LIBS@ |
1269 | - LIBTOOL = @LIBTOOL@ |
1270 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1271 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/ndbfs/Makefile.in |
1272 | ---- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1273 | -+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1274 | -@@ -197,6 +197,7 @@ |
1275 | - LIBDL = @LIBDL@ |
1276 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1277 | - LIBOBJS = @LIBOBJS@ |
1278 | -+LIBRT = @LIBRT@ |
1279 | - LIBS = @LIBS@ |
1280 | - LIBTOOL = @LIBTOOL@ |
1281 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1282 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/qmgr/Makefile.in |
1283 | ---- a/ndb/src/kernel/blocks/qmgr/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1284 | -+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1285 | -@@ -196,6 +196,7 @@ |
1286 | - LIBDL = @LIBDL@ |
1287 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1288 | - LIBOBJS = @LIBOBJS@ |
1289 | -+LIBRT = @LIBRT@ |
1290 | - LIBS = @LIBS@ |
1291 | - LIBTOOL = @LIBTOOL@ |
1292 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1293 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/suma/Makefile.in |
1294 | ---- a/ndb/src/kernel/blocks/suma/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1295 | -+++ b/ndb/src/kernel/blocks/suma/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1296 | -@@ -196,6 +196,7 @@ |
1297 | - LIBDL = @LIBDL@ |
1298 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1299 | - LIBOBJS = @LIBOBJS@ |
1300 | -+LIBRT = @LIBRT@ |
1301 | - LIBS = @LIBS@ |
1302 | - LIBTOOL = @LIBTOOL@ |
1303 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1304 | -diff -r 23e5576aa59a ndb/src/kernel/blocks/trix/Makefile.in |
1305 | ---- a/ndb/src/kernel/blocks/trix/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1306 | -+++ b/ndb/src/kernel/blocks/trix/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1307 | -@@ -196,6 +196,7 @@ |
1308 | - LIBDL = @LIBDL@ |
1309 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1310 | - LIBOBJS = @LIBOBJS@ |
1311 | -+LIBRT = @LIBRT@ |
1312 | - LIBS = @LIBS@ |
1313 | - LIBTOOL = @LIBTOOL@ |
1314 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1315 | -diff -r 23e5576aa59a ndb/src/kernel/error/Makefile.in |
1316 | ---- a/ndb/src/kernel/error/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1317 | -+++ b/ndb/src/kernel/error/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1318 | -@@ -206,6 +206,7 @@ |
1319 | - LIBDL = @LIBDL@ |
1320 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1321 | - LIBOBJS = @LIBOBJS@ |
1322 | -+LIBRT = @LIBRT@ |
1323 | - LIBS = @LIBS@ |
1324 | - LIBTOOL = @LIBTOOL@ |
1325 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1326 | -diff -r 23e5576aa59a ndb/src/kernel/vm/Makefile.in |
1327 | ---- a/ndb/src/kernel/vm/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1328 | -+++ b/ndb/src/kernel/vm/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1329 | -@@ -207,6 +207,7 @@ |
1330 | - LIBDL = @LIBDL@ |
1331 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1332 | - LIBOBJS = @LIBOBJS@ |
1333 | -+LIBRT = @LIBRT@ |
1334 | - LIBS = @LIBS@ |
1335 | - LIBTOOL = @LIBTOOL@ |
1336 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1337 | -diff -r 23e5576aa59a ndb/src/mgmapi/Makefile.in |
1338 | ---- a/ndb/src/mgmapi/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1339 | -+++ b/ndb/src/mgmapi/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1340 | -@@ -205,6 +205,7 @@ |
1341 | - LIBDL = @LIBDL@ |
1342 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1343 | - LIBOBJS = @LIBOBJS@ |
1344 | -+LIBRT = @LIBRT@ |
1345 | - LIBS = @LIBS@ |
1346 | - LIBTOOL = @LIBTOOL@ |
1347 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1348 | -diff -r 23e5576aa59a ndb/src/mgmclient/Makefile.in |
1349 | ---- a/ndb/src/mgmclient/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1350 | -+++ b/ndb/src/mgmclient/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1351 | -@@ -216,6 +216,7 @@ |
1352 | - LIBDL = @LIBDL@ |
1353 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1354 | - LIBOBJS = @LIBOBJS@ |
1355 | -+LIBRT = @LIBRT@ |
1356 | - LIBS = @LIBS@ |
1357 | - LIBTOOL = @LIBTOOL@ |
1358 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1359 | -diff -r 23e5576aa59a ndb/src/mgmsrv/Makefile.in |
1360 | ---- a/ndb/src/mgmsrv/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1361 | -+++ b/ndb/src/mgmsrv/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1362 | -@@ -213,6 +213,7 @@ |
1363 | - LIBDL = @LIBDL@ |
1364 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1365 | - LIBOBJS = @LIBOBJS@ |
1366 | -+LIBRT = @LIBRT@ |
1367 | - LIBS = @LIBS@ |
1368 | - LIBTOOL = @LIBTOOL@ |
1369 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1370 | -diff -r 23e5576aa59a ndb/src/ndbapi/Makefile.in |
1371 | ---- a/ndb/src/ndbapi/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1372 | -+++ b/ndb/src/ndbapi/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1373 | -@@ -215,6 +215,7 @@ |
1374 | - LIBDL = @LIBDL@ |
1375 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1376 | - LIBOBJS = @LIBOBJS@ |
1377 | -+LIBRT = @LIBRT@ |
1378 | - LIBS = @LIBS@ |
1379 | - LIBTOOL = @LIBTOOL@ |
1380 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1381 | -diff -r 23e5576aa59a ndb/test/Makefile.in |
1382 | ---- a/ndb/test/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1383 | -+++ b/ndb/test/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1384 | -@@ -156,6 +156,7 @@ |
1385 | - LIBDL = @LIBDL@ |
1386 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1387 | - LIBOBJS = @LIBOBJS@ |
1388 | -+LIBRT = @LIBRT@ |
1389 | - LIBS = @LIBS@ |
1390 | - LIBTOOL = @LIBTOOL@ |
1391 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1392 | -diff -r 23e5576aa59a ndb/test/ndbapi/Makefile.in |
1393 | ---- a/ndb/test/ndbapi/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1394 | -+++ b/ndb/test/ndbapi/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1395 | -@@ -595,6 +595,7 @@ |
1396 | - LIBDL = @LIBDL@ |
1397 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1398 | - LIBOBJS = @LIBOBJS@ |
1399 | -+LIBRT = @LIBRT@ |
1400 | - LIBS = @LIBS@ |
1401 | - LIBTOOL = @LIBTOOL@ |
1402 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1403 | -diff -r 23e5576aa59a ndb/test/ndbapi/bank/Makefile.in |
1404 | ---- a/ndb/test/ndbapi/bank/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1405 | -+++ b/ndb/test/ndbapi/bank/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1406 | -@@ -282,6 +282,7 @@ |
1407 | - LIBDL = @LIBDL@ |
1408 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1409 | - LIBOBJS = @LIBOBJS@ |
1410 | -+LIBRT = @LIBRT@ |
1411 | - LIBS = @LIBS@ |
1412 | - LIBTOOL = @LIBTOOL@ |
1413 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1414 | -diff -r 23e5576aa59a ndb/test/run-test/Makefile.in |
1415 | ---- a/ndb/test/run-test/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1416 | -+++ b/ndb/test/run-test/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1417 | -@@ -243,6 +243,7 @@ |
1418 | - LIBDL = @LIBDL@ |
1419 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1420 | - LIBOBJS = @LIBOBJS@ |
1421 | -+LIBRT = @LIBRT@ |
1422 | - LIBS = @LIBS@ |
1423 | - LIBTOOL = @LIBTOOL@ |
1424 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1425 | -diff -r 23e5576aa59a ndb/test/src/Makefile.in |
1426 | ---- a/ndb/test/src/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1427 | -+++ b/ndb/test/src/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1428 | -@@ -213,6 +213,7 @@ |
1429 | - LIBDL = @LIBDL@ |
1430 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1431 | - LIBOBJS = @LIBOBJS@ |
1432 | -+LIBRT = @LIBRT@ |
1433 | - LIBS = @LIBS@ |
1434 | - LIBTOOL = @LIBTOOL@ |
1435 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1436 | -diff -r 23e5576aa59a ndb/test/tools/Makefile.in |
1437 | ---- a/ndb/test/tools/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1438 | -+++ b/ndb/test/tools/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1439 | -@@ -325,6 +325,7 @@ |
1440 | - LIBDL = @LIBDL@ |
1441 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1442 | - LIBOBJS = @LIBOBJS@ |
1443 | -+LIBRT = @LIBRT@ |
1444 | - LIBS = @LIBS@ |
1445 | - LIBTOOL = @LIBTOOL@ |
1446 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1447 | -diff -r 23e5576aa59a ndb/tools/Makefile.in |
1448 | ---- a/ndb/tools/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1449 | -+++ b/ndb/tools/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1450 | -@@ -344,6 +344,7 @@ |
1451 | - LIBDL = @LIBDL@ |
1452 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1453 | - LIBOBJS = @LIBOBJS@ |
1454 | -+LIBRT = @LIBRT@ |
1455 | - LIBS = @LIBS@ |
1456 | - LIBTOOL = @LIBTOOL@ |
1457 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1458 | -diff -r 23e5576aa59a netware/Makefile.in |
1459 | ---- a/netware/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1460 | -+++ b/netware/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1461 | -@@ -199,6 +199,7 @@ |
1462 | - LIBDL = @LIBDL@ |
1463 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1464 | - LIBOBJS = @LIBOBJS@ |
1465 | -+LIBRT = @LIBRT@ |
1466 | - LIBS = @LIBS@ |
1467 | - LIBTOOL = @LIBTOOL@ |
1468 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1469 | -diff -r 23e5576aa59a os2/Makefile.in |
1470 | ---- a/os2/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1471 | -+++ b/os2/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1472 | -@@ -156,6 +156,7 @@ |
1473 | - LIBDL = @LIBDL@ |
1474 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1475 | - LIBOBJS = @LIBOBJS@ |
1476 | -+LIBRT = @LIBRT@ |
1477 | - LIBS = @LIBS@ |
1478 | - LIBTOOL = @LIBTOOL@ |
1479 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1480 | -diff -r 23e5576aa59a os2/include/Makefile.in |
1481 | ---- a/os2/include/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1482 | -+++ b/os2/include/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1483 | -@@ -156,6 +156,7 @@ |
1484 | - LIBDL = @LIBDL@ |
1485 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1486 | - LIBOBJS = @LIBOBJS@ |
1487 | -+LIBRT = @LIBRT@ |
1488 | - LIBS = @LIBS@ |
1489 | - LIBTOOL = @LIBTOOL@ |
1490 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1491 | -diff -r 23e5576aa59a os2/include/sys/Makefile.in |
1492 | ---- a/os2/include/sys/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
1493 | -+++ b/os2/include/sys/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
1494 | -@@ -144,6 +144,7 @@ |
1495 | - LIBDL = @LIBDL@ |
1496 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1497 | - LIBOBJS = @LIBOBJS@ |
1498 | -+LIBRT = @LIBRT@ |
1499 | - LIBS = @LIBS@ |
1500 | - LIBTOOL = @LIBTOOL@ |
1501 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1502 | -diff -r 23e5576aa59a patch_info/userstats.info |
1503 | ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1504 | -+++ b/patch_info/userstats.info Tue Feb 17 22:33:23 2009 -0800 |
1505 | +Index: mysql-5.0.77/mysys/Makefile.in |
1506 | +=================================================================== |
1507 | +--- mysql-5.0.77.orig/mysys/Makefile.in |
1508 | ++++ mysql-5.0.77/mysys/Makefile.in |
1509 | +@@ -228,6 +228,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1510 | + LIBDL = @LIBDL@ |
1511 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1512 | + LIBOBJS = @LIBOBJS@ |
1513 | ++LIBRT = @LIBRT@ |
1514 | + LIBS = @LIBS@ |
1515 | + LIBTOOL = @LIBTOOL@ |
1516 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1517 | +Index: mysql-5.0.77/ndb/Makefile.in |
1518 | +=================================================================== |
1519 | +--- mysql-5.0.77.orig/ndb/Makefile.in |
1520 | ++++ mysql-5.0.77/ndb/Makefile.in |
1521 | +@@ -171,6 +171,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1522 | + LIBDL = @LIBDL@ |
1523 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1524 | + LIBOBJS = @LIBOBJS@ |
1525 | ++LIBRT = @LIBRT@ |
1526 | + LIBS = @LIBS@ |
1527 | + LIBTOOL = @LIBTOOL@ |
1528 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1529 | +Index: mysql-5.0.77/ndb/docs/Makefile.in |
1530 | +=================================================================== |
1531 | +--- mysql-5.0.77.orig/ndb/docs/Makefile.in |
1532 | ++++ mysql-5.0.77/ndb/docs/Makefile.in |
1533 | +@@ -149,6 +149,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1534 | + LIBDL = @LIBDL@ |
1535 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1536 | + LIBOBJS = @LIBOBJS@ |
1537 | ++LIBRT = @LIBRT@ |
1538 | + LIBS = @LIBS@ |
1539 | + LIBTOOL = @LIBTOOL@ |
1540 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1541 | +Index: mysql-5.0.77/ndb/include/Makefile.in |
1542 | +=================================================================== |
1543 | +--- mysql-5.0.77.orig/ndb/include/Makefile.in |
1544 | ++++ mysql-5.0.77/ndb/include/Makefile.in |
1545 | +@@ -179,6 +179,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1546 | + LIBDL = @LIBDL@ |
1547 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1548 | + LIBOBJS = @LIBOBJS@ |
1549 | ++LIBRT = @LIBRT@ |
1550 | + LIBS = @LIBS@ |
1551 | + LIBTOOL = @LIBTOOL@ |
1552 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1553 | +Index: mysql-5.0.77/ndb/src/Makefile.in |
1554 | +=================================================================== |
1555 | +--- mysql-5.0.77.orig/ndb/src/Makefile.in |
1556 | ++++ mysql-5.0.77/ndb/src/Makefile.in |
1557 | +@@ -204,6 +204,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1558 | + LIBDL = @LIBDL@ |
1559 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1560 | + LIBOBJS = @LIBOBJS@ |
1561 | ++LIBRT = @LIBRT@ |
1562 | + LIBS = @LIBS@ |
1563 | + LIBTOOL = @LIBTOOL@ |
1564 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1565 | +Index: mysql-5.0.77/ndb/src/common/Makefile.in |
1566 | +=================================================================== |
1567 | +--- mysql-5.0.77.orig/ndb/src/common/Makefile.in |
1568 | ++++ mysql-5.0.77/ndb/src/common/Makefile.in |
1569 | +@@ -174,6 +174,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1570 | + LIBDL = @LIBDL@ |
1571 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1572 | + LIBOBJS = @LIBOBJS@ |
1573 | ++LIBRT = @LIBRT@ |
1574 | + LIBS = @LIBS@ |
1575 | + LIBTOOL = @LIBTOOL@ |
1576 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1577 | +Index: mysql-5.0.77/ndb/src/common/debugger/Makefile.in |
1578 | +=================================================================== |
1579 | +--- mysql-5.0.77.orig/ndb/src/common/debugger/Makefile.in |
1580 | ++++ mysql-5.0.77/ndb/src/common/debugger/Makefile.in |
1581 | +@@ -206,6 +206,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1582 | + LIBDL = @LIBDL@ |
1583 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1584 | + LIBOBJS = @LIBOBJS@ |
1585 | ++LIBRT = @LIBRT@ |
1586 | + LIBS = @LIBS@ |
1587 | + LIBTOOL = @LIBTOOL@ |
1588 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1589 | +Index: mysql-5.0.77/ndb/src/common/debugger/signaldata/Makefile.in |
1590 | +=================================================================== |
1591 | +--- mysql-5.0.77.orig/ndb/src/common/debugger/signaldata/Makefile.in |
1592 | ++++ mysql-5.0.77/ndb/src/common/debugger/signaldata/Makefile.in |
1593 | +@@ -211,6 +211,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1594 | + LIBDL = @LIBDL@ |
1595 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1596 | + LIBOBJS = @LIBOBJS@ |
1597 | ++LIBRT = @LIBRT@ |
1598 | + LIBS = @LIBS@ |
1599 | + LIBTOOL = @LIBTOOL@ |
1600 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1601 | +Index: mysql-5.0.77/ndb/src/common/logger/Makefile.in |
1602 | +=================================================================== |
1603 | +--- mysql-5.0.77.orig/ndb/src/common/logger/Makefile.in |
1604 | ++++ mysql-5.0.77/ndb/src/common/logger/Makefile.in |
1605 | +@@ -197,6 +197,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1606 | + LIBDL = @LIBDL@ |
1607 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1608 | + LIBOBJS = @LIBOBJS@ |
1609 | ++LIBRT = @LIBRT@ |
1610 | + LIBS = @LIBS@ |
1611 | + LIBTOOL = @LIBTOOL@ |
1612 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1613 | +Index: mysql-5.0.77/ndb/src/common/mgmcommon/Makefile.in |
1614 | +=================================================================== |
1615 | +--- mysql-5.0.77.orig/ndb/src/common/mgmcommon/Makefile.in |
1616 | ++++ mysql-5.0.77/ndb/src/common/mgmcommon/Makefile.in |
1617 | +@@ -211,6 +211,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1618 | + LIBDL = @LIBDL@ |
1619 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1620 | + LIBOBJS = @LIBOBJS@ |
1621 | ++LIBRT = @LIBRT@ |
1622 | + LIBS = @LIBS@ |
1623 | + LIBTOOL = @LIBTOOL@ |
1624 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1625 | +Index: mysql-5.0.77/ndb/src/common/portlib/Makefile.in |
1626 | +=================================================================== |
1627 | +--- mysql-5.0.77.orig/ndb/src/common/portlib/Makefile.in |
1628 | ++++ mysql-5.0.77/ndb/src/common/portlib/Makefile.in |
1629 | +@@ -222,6 +222,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1630 | + LIBDL = @LIBDL@ |
1631 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1632 | + LIBOBJS = @LIBOBJS@ |
1633 | ++LIBRT = @LIBRT@ |
1634 | + LIBS = @LIBS@ |
1635 | + LIBTOOL = @LIBTOOL@ |
1636 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1637 | +Index: mysql-5.0.77/ndb/src/common/transporter/Makefile.in |
1638 | +=================================================================== |
1639 | +--- mysql-5.0.77.orig/ndb/src/common/transporter/Makefile.in |
1640 | ++++ mysql-5.0.77/ndb/src/common/transporter/Makefile.in |
1641 | +@@ -197,6 +197,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1642 | + LIBDL = @LIBDL@ |
1643 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1644 | + LIBOBJS = @LIBOBJS@ |
1645 | ++LIBRT = @LIBRT@ |
1646 | + LIBS = @LIBS@ |
1647 | + LIBTOOL = @LIBTOOL@ |
1648 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1649 | +Index: mysql-5.0.77/ndb/src/common/util/Makefile.in |
1650 | +=================================================================== |
1651 | +--- mysql-5.0.77.orig/ndb/src/common/util/Makefile.in |
1652 | ++++ mysql-5.0.77/ndb/src/common/util/Makefile.in |
1653 | +@@ -217,6 +217,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1654 | + LIBDL = @LIBDL@ |
1655 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1656 | + LIBOBJS = @LIBOBJS@ |
1657 | ++LIBRT = @LIBRT@ |
1658 | + LIBS = @LIBS@ |
1659 | + LIBTOOL = @LIBTOOL@ |
1660 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1661 | +Index: mysql-5.0.77/ndb/src/cw/Makefile.in |
1662 | +=================================================================== |
1663 | +--- mysql-5.0.77.orig/ndb/src/cw/Makefile.in |
1664 | ++++ mysql-5.0.77/ndb/src/cw/Makefile.in |
1665 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1666 | + LIBDL = @LIBDL@ |
1667 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1668 | + LIBOBJS = @LIBOBJS@ |
1669 | ++LIBRT = @LIBRT@ |
1670 | + LIBS = @LIBS@ |
1671 | + LIBTOOL = @LIBTOOL@ |
1672 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1673 | +Index: mysql-5.0.77/ndb/src/cw/cpcd/Makefile.in |
1674 | +=================================================================== |
1675 | +--- mysql-5.0.77.orig/ndb/src/cw/cpcd/Makefile.in |
1676 | ++++ mysql-5.0.77/ndb/src/cw/cpcd/Makefile.in |
1677 | +@@ -207,6 +207,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1678 | + LIBDL = @LIBDL@ |
1679 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1680 | + LIBOBJS = @LIBOBJS@ |
1681 | ++LIBRT = @LIBRT@ |
1682 | + LIBS = @LIBS@ |
1683 | + LIBTOOL = @LIBTOOL@ |
1684 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1685 | +Index: mysql-5.0.77/ndb/src/kernel/Makefile.in |
1686 | +=================================================================== |
1687 | +--- mysql-5.0.77.orig/ndb/src/kernel/Makefile.in |
1688 | ++++ mysql-5.0.77/ndb/src/kernel/Makefile.in |
1689 | +@@ -227,6 +227,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1690 | + LIBDL = @LIBDL@ |
1691 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1692 | + LIBOBJS = @LIBOBJS@ |
1693 | ++LIBRT = @LIBRT@ |
1694 | + LIBS = @LIBS@ |
1695 | + LIBTOOL = @LIBTOOL@ |
1696 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1697 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/Makefile.in |
1698 | +=================================================================== |
1699 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/Makefile.in |
1700 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/Makefile.in |
1701 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1702 | + LIBDL = @LIBDL@ |
1703 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1704 | + LIBOBJS = @LIBOBJS@ |
1705 | ++LIBRT = @LIBRT@ |
1706 | + LIBS = @LIBS@ |
1707 | + LIBTOOL = @LIBTOOL@ |
1708 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1709 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/backup/Makefile.in |
1710 | +=================================================================== |
1711 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/backup/Makefile.in |
1712 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/backup/Makefile.in |
1713 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1714 | + LIBDL = @LIBDL@ |
1715 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1716 | + LIBOBJS = @LIBOBJS@ |
1717 | ++LIBRT = @LIBRT@ |
1718 | + LIBS = @LIBS@ |
1719 | + LIBTOOL = @LIBTOOL@ |
1720 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1721 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/cmvmi/Makefile.in |
1722 | +=================================================================== |
1723 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/cmvmi/Makefile.in |
1724 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/cmvmi/Makefile.in |
1725 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1726 | + LIBDL = @LIBDL@ |
1727 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1728 | + LIBOBJS = @LIBOBJS@ |
1729 | ++LIBRT = @LIBRT@ |
1730 | + LIBS = @LIBS@ |
1731 | + LIBTOOL = @LIBTOOL@ |
1732 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1733 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbacc/Makefile.in |
1734 | +=================================================================== |
1735 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbacc/Makefile.in |
1736 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbacc/Makefile.in |
1737 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1738 | + LIBDL = @LIBDL@ |
1739 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1740 | + LIBOBJS = @LIBOBJS@ |
1741 | ++LIBRT = @LIBRT@ |
1742 | + LIBS = @LIBS@ |
1743 | + LIBTOOL = @LIBTOOL@ |
1744 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1745 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbdict/Makefile.in |
1746 | +=================================================================== |
1747 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbdict/Makefile.in |
1748 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbdict/Makefile.in |
1749 | +@@ -206,6 +206,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1750 | + LIBDL = @LIBDL@ |
1751 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1752 | + LIBOBJS = @LIBOBJS@ |
1753 | ++LIBRT = @LIBRT@ |
1754 | + LIBS = @LIBS@ |
1755 | + LIBTOOL = @LIBTOOL@ |
1756 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1757 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbdih/Makefile.in |
1758 | +=================================================================== |
1759 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbdih/Makefile.in |
1760 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbdih/Makefile.in |
1761 | +@@ -203,6 +203,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1762 | + LIBDL = @LIBDL@ |
1763 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1764 | + LIBOBJS = @LIBOBJS@ |
1765 | ++LIBRT = @LIBRT@ |
1766 | + LIBS = @LIBS@ |
1767 | + LIBTOOL = @LIBTOOL@ |
1768 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1769 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dblqh/Makefile.in |
1770 | +=================================================================== |
1771 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dblqh/Makefile.in |
1772 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dblqh/Makefile.in |
1773 | +@@ -204,6 +204,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1774 | + LIBDL = @LIBDL@ |
1775 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1776 | + LIBOBJS = @LIBOBJS@ |
1777 | ++LIBRT = @LIBRT@ |
1778 | + LIBS = @LIBS@ |
1779 | + LIBTOOL = @LIBTOOL@ |
1780 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1781 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbtc/Makefile.in |
1782 | +=================================================================== |
1783 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbtc/Makefile.in |
1784 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbtc/Makefile.in |
1785 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1786 | + LIBDL = @LIBDL@ |
1787 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1788 | + LIBOBJS = @LIBOBJS@ |
1789 | ++LIBRT = @LIBRT@ |
1790 | + LIBS = @LIBS@ |
1791 | + LIBTOOL = @LIBTOOL@ |
1792 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1793 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbtup/Makefile.in |
1794 | +=================================================================== |
1795 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbtup/Makefile.in |
1796 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbtup/Makefile.in |
1797 | +@@ -204,6 +204,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1798 | + LIBDL = @LIBDL@ |
1799 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1800 | + LIBOBJS = @LIBOBJS@ |
1801 | ++LIBRT = @LIBRT@ |
1802 | + LIBS = @LIBS@ |
1803 | + LIBTOOL = @LIBTOOL@ |
1804 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1805 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbtux/Makefile.in |
1806 | +=================================================================== |
1807 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbtux/Makefile.in |
1808 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbtux/Makefile.in |
1809 | +@@ -199,6 +199,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1810 | + LIBDL = @LIBDL@ |
1811 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1812 | + LIBOBJS = @LIBOBJS@ |
1813 | ++LIBRT = @LIBRT@ |
1814 | + LIBS = @LIBS@ |
1815 | + LIBTOOL = @LIBTOOL@ |
1816 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1817 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/dbutil/Makefile.in |
1818 | +=================================================================== |
1819 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/dbutil/Makefile.in |
1820 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/dbutil/Makefile.in |
1821 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1822 | + LIBDL = @LIBDL@ |
1823 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1824 | + LIBOBJS = @LIBOBJS@ |
1825 | ++LIBRT = @LIBRT@ |
1826 | + LIBS = @LIBS@ |
1827 | + LIBTOOL = @LIBTOOL@ |
1828 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1829 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/ndbcntr/Makefile.in |
1830 | +=================================================================== |
1831 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/ndbcntr/Makefile.in |
1832 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/ndbcntr/Makefile.in |
1833 | +@@ -197,6 +197,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1834 | + LIBDL = @LIBDL@ |
1835 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1836 | + LIBOBJS = @LIBOBJS@ |
1837 | ++LIBRT = @LIBRT@ |
1838 | + LIBS = @LIBS@ |
1839 | + LIBTOOL = @LIBTOOL@ |
1840 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1841 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/ndbfs/Makefile.in |
1842 | +=================================================================== |
1843 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/ndbfs/Makefile.in |
1844 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/ndbfs/Makefile.in |
1845 | +@@ -197,6 +197,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1846 | + LIBDL = @LIBDL@ |
1847 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1848 | + LIBOBJS = @LIBOBJS@ |
1849 | ++LIBRT = @LIBRT@ |
1850 | + LIBS = @LIBS@ |
1851 | + LIBTOOL = @LIBTOOL@ |
1852 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1853 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/qmgr/Makefile.in |
1854 | +=================================================================== |
1855 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/qmgr/Makefile.in |
1856 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/qmgr/Makefile.in |
1857 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1858 | + LIBDL = @LIBDL@ |
1859 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1860 | + LIBOBJS = @LIBOBJS@ |
1861 | ++LIBRT = @LIBRT@ |
1862 | + LIBS = @LIBS@ |
1863 | + LIBTOOL = @LIBTOOL@ |
1864 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1865 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/suma/Makefile.in |
1866 | +=================================================================== |
1867 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/suma/Makefile.in |
1868 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/suma/Makefile.in |
1869 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1870 | + LIBDL = @LIBDL@ |
1871 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1872 | + LIBOBJS = @LIBOBJS@ |
1873 | ++LIBRT = @LIBRT@ |
1874 | + LIBS = @LIBS@ |
1875 | + LIBTOOL = @LIBTOOL@ |
1876 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1877 | +Index: mysql-5.0.77/ndb/src/kernel/blocks/trix/Makefile.in |
1878 | +=================================================================== |
1879 | +--- mysql-5.0.77.orig/ndb/src/kernel/blocks/trix/Makefile.in |
1880 | ++++ mysql-5.0.77/ndb/src/kernel/blocks/trix/Makefile.in |
1881 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1882 | + LIBDL = @LIBDL@ |
1883 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1884 | + LIBOBJS = @LIBOBJS@ |
1885 | ++LIBRT = @LIBRT@ |
1886 | + LIBS = @LIBS@ |
1887 | + LIBTOOL = @LIBTOOL@ |
1888 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1889 | +Index: mysql-5.0.77/ndb/src/kernel/error/Makefile.in |
1890 | +=================================================================== |
1891 | +--- mysql-5.0.77.orig/ndb/src/kernel/error/Makefile.in |
1892 | ++++ mysql-5.0.77/ndb/src/kernel/error/Makefile.in |
1893 | +@@ -206,6 +206,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1894 | + LIBDL = @LIBDL@ |
1895 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1896 | + LIBOBJS = @LIBOBJS@ |
1897 | ++LIBRT = @LIBRT@ |
1898 | + LIBS = @LIBS@ |
1899 | + LIBTOOL = @LIBTOOL@ |
1900 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1901 | +Index: mysql-5.0.77/ndb/src/kernel/vm/Makefile.in |
1902 | +=================================================================== |
1903 | +--- mysql-5.0.77.orig/ndb/src/kernel/vm/Makefile.in |
1904 | ++++ mysql-5.0.77/ndb/src/kernel/vm/Makefile.in |
1905 | +@@ -207,6 +207,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1906 | + LIBDL = @LIBDL@ |
1907 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1908 | + LIBOBJS = @LIBOBJS@ |
1909 | ++LIBRT = @LIBRT@ |
1910 | + LIBS = @LIBS@ |
1911 | + LIBTOOL = @LIBTOOL@ |
1912 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1913 | +Index: mysql-5.0.77/ndb/src/mgmapi/Makefile.in |
1914 | +=================================================================== |
1915 | +--- mysql-5.0.77.orig/ndb/src/mgmapi/Makefile.in |
1916 | ++++ mysql-5.0.77/ndb/src/mgmapi/Makefile.in |
1917 | +@@ -205,6 +205,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1918 | + LIBDL = @LIBDL@ |
1919 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1920 | + LIBOBJS = @LIBOBJS@ |
1921 | ++LIBRT = @LIBRT@ |
1922 | + LIBS = @LIBS@ |
1923 | + LIBTOOL = @LIBTOOL@ |
1924 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1925 | +Index: mysql-5.0.77/ndb/src/mgmclient/Makefile.in |
1926 | +=================================================================== |
1927 | +--- mysql-5.0.77.orig/ndb/src/mgmclient/Makefile.in |
1928 | ++++ mysql-5.0.77/ndb/src/mgmclient/Makefile.in |
1929 | +@@ -216,6 +216,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1930 | + LIBDL = @LIBDL@ |
1931 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1932 | + LIBOBJS = @LIBOBJS@ |
1933 | ++LIBRT = @LIBRT@ |
1934 | + LIBS = @LIBS@ |
1935 | + LIBTOOL = @LIBTOOL@ |
1936 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1937 | +Index: mysql-5.0.77/ndb/src/mgmsrv/Makefile.in |
1938 | +=================================================================== |
1939 | +--- mysql-5.0.77.orig/ndb/src/mgmsrv/Makefile.in |
1940 | ++++ mysql-5.0.77/ndb/src/mgmsrv/Makefile.in |
1941 | +@@ -213,6 +213,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1942 | + LIBDL = @LIBDL@ |
1943 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1944 | + LIBOBJS = @LIBOBJS@ |
1945 | ++LIBRT = @LIBRT@ |
1946 | + LIBS = @LIBS@ |
1947 | + LIBTOOL = @LIBTOOL@ |
1948 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1949 | +Index: mysql-5.0.77/ndb/src/ndbapi/Makefile.in |
1950 | +=================================================================== |
1951 | +--- mysql-5.0.77.orig/ndb/src/ndbapi/Makefile.in |
1952 | ++++ mysql-5.0.77/ndb/src/ndbapi/Makefile.in |
1953 | +@@ -215,6 +215,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1954 | + LIBDL = @LIBDL@ |
1955 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1956 | + LIBOBJS = @LIBOBJS@ |
1957 | ++LIBRT = @LIBRT@ |
1958 | + LIBS = @LIBS@ |
1959 | + LIBTOOL = @LIBTOOL@ |
1960 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1961 | +Index: mysql-5.0.77/ndb/test/Makefile.in |
1962 | +=================================================================== |
1963 | +--- mysql-5.0.77.orig/ndb/test/Makefile.in |
1964 | ++++ mysql-5.0.77/ndb/test/Makefile.in |
1965 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1966 | + LIBDL = @LIBDL@ |
1967 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1968 | + LIBOBJS = @LIBOBJS@ |
1969 | ++LIBRT = @LIBRT@ |
1970 | + LIBS = @LIBS@ |
1971 | + LIBTOOL = @LIBTOOL@ |
1972 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1973 | +Index: mysql-5.0.77/ndb/test/ndbapi/Makefile.in |
1974 | +=================================================================== |
1975 | +--- mysql-5.0.77.orig/ndb/test/ndbapi/Makefile.in |
1976 | ++++ mysql-5.0.77/ndb/test/ndbapi/Makefile.in |
1977 | +@@ -595,6 +595,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1978 | + LIBDL = @LIBDL@ |
1979 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1980 | + LIBOBJS = @LIBOBJS@ |
1981 | ++LIBRT = @LIBRT@ |
1982 | + LIBS = @LIBS@ |
1983 | + LIBTOOL = @LIBTOOL@ |
1984 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1985 | +Index: mysql-5.0.77/ndb/test/ndbapi/bank/Makefile.in |
1986 | +=================================================================== |
1987 | +--- mysql-5.0.77.orig/ndb/test/ndbapi/bank/Makefile.in |
1988 | ++++ mysql-5.0.77/ndb/test/ndbapi/bank/Makefile.in |
1989 | +@@ -282,6 +282,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
1990 | + LIBDL = @LIBDL@ |
1991 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
1992 | + LIBOBJS = @LIBOBJS@ |
1993 | ++LIBRT = @LIBRT@ |
1994 | + LIBS = @LIBS@ |
1995 | + LIBTOOL = @LIBTOOL@ |
1996 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
1997 | +Index: mysql-5.0.77/ndb/test/run-test/Makefile.in |
1998 | +=================================================================== |
1999 | +--- mysql-5.0.77.orig/ndb/test/run-test/Makefile.in |
2000 | ++++ mysql-5.0.77/ndb/test/run-test/Makefile.in |
2001 | +@@ -243,6 +243,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2002 | + LIBDL = @LIBDL@ |
2003 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2004 | + LIBOBJS = @LIBOBJS@ |
2005 | ++LIBRT = @LIBRT@ |
2006 | + LIBS = @LIBS@ |
2007 | + LIBTOOL = @LIBTOOL@ |
2008 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2009 | +Index: mysql-5.0.77/ndb/test/src/Makefile.in |
2010 | +=================================================================== |
2011 | +--- mysql-5.0.77.orig/ndb/test/src/Makefile.in |
2012 | ++++ mysql-5.0.77/ndb/test/src/Makefile.in |
2013 | +@@ -213,6 +213,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2014 | + LIBDL = @LIBDL@ |
2015 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2016 | + LIBOBJS = @LIBOBJS@ |
2017 | ++LIBRT = @LIBRT@ |
2018 | + LIBS = @LIBS@ |
2019 | + LIBTOOL = @LIBTOOL@ |
2020 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2021 | +Index: mysql-5.0.77/ndb/test/tools/Makefile.in |
2022 | +=================================================================== |
2023 | +--- mysql-5.0.77.orig/ndb/test/tools/Makefile.in |
2024 | ++++ mysql-5.0.77/ndb/test/tools/Makefile.in |
2025 | +@@ -325,6 +325,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2026 | + LIBDL = @LIBDL@ |
2027 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2028 | + LIBOBJS = @LIBOBJS@ |
2029 | ++LIBRT = @LIBRT@ |
2030 | + LIBS = @LIBS@ |
2031 | + LIBTOOL = @LIBTOOL@ |
2032 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2033 | +Index: mysql-5.0.77/ndb/tools/Makefile.in |
2034 | +=================================================================== |
2035 | +--- mysql-5.0.77.orig/ndb/tools/Makefile.in |
2036 | ++++ mysql-5.0.77/ndb/tools/Makefile.in |
2037 | +@@ -344,6 +344,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2038 | + LIBDL = @LIBDL@ |
2039 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2040 | + LIBOBJS = @LIBOBJS@ |
2041 | ++LIBRT = @LIBRT@ |
2042 | + LIBS = @LIBS@ |
2043 | + LIBTOOL = @LIBTOOL@ |
2044 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2045 | +Index: mysql-5.0.77/netware/Makefile.in |
2046 | +=================================================================== |
2047 | +--- mysql-5.0.77.orig/netware/Makefile.in |
2048 | ++++ mysql-5.0.77/netware/Makefile.in |
2049 | +@@ -199,6 +199,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2050 | + LIBDL = @LIBDL@ |
2051 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2052 | + LIBOBJS = @LIBOBJS@ |
2053 | ++LIBRT = @LIBRT@ |
2054 | + LIBS = @LIBS@ |
2055 | + LIBTOOL = @LIBTOOL@ |
2056 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2057 | +Index: mysql-5.0.77/os2/Makefile.in |
2058 | +=================================================================== |
2059 | +--- mysql-5.0.77.orig/os2/Makefile.in |
2060 | ++++ mysql-5.0.77/os2/Makefile.in |
2061 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2062 | + LIBDL = @LIBDL@ |
2063 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2064 | + LIBOBJS = @LIBOBJS@ |
2065 | ++LIBRT = @LIBRT@ |
2066 | + LIBS = @LIBS@ |
2067 | + LIBTOOL = @LIBTOOL@ |
2068 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2069 | +Index: mysql-5.0.77/os2/include/Makefile.in |
2070 | +=================================================================== |
2071 | +--- mysql-5.0.77.orig/os2/include/Makefile.in |
2072 | ++++ mysql-5.0.77/os2/include/Makefile.in |
2073 | +@@ -156,6 +156,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2074 | + LIBDL = @LIBDL@ |
2075 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2076 | + LIBOBJS = @LIBOBJS@ |
2077 | ++LIBRT = @LIBRT@ |
2078 | + LIBS = @LIBS@ |
2079 | + LIBTOOL = @LIBTOOL@ |
2080 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2081 | +Index: mysql-5.0.77/os2/include/sys/Makefile.in |
2082 | +=================================================================== |
2083 | +--- mysql-5.0.77.orig/os2/include/sys/Makefile.in |
2084 | ++++ mysql-5.0.77/os2/include/sys/Makefile.in |
2085 | +@@ -144,6 +144,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2086 | + LIBDL = @LIBDL@ |
2087 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2088 | + LIBOBJS = @LIBOBJS@ |
2089 | ++LIBRT = @LIBRT@ |
2090 | + LIBS = @LIBS@ |
2091 | + LIBTOOL = @LIBTOOL@ |
2092 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2093 | +Index: mysql-5.0.77/patch_info/userstats.info |
2094 | +=================================================================== |
2095 | +--- /dev/null |
2096 | ++++ mysql-5.0.77/patch_info/userstats.info |
2097 | @@ -0,0 +1,14 @@ |
2098 | +File=userstatsv2.patch |
2099 | +Name=SHOW USER/TABLE/INDEX statistics |
2100 | @@ -1330,87 +1415,95 @@ |
2101 | + |
2102 | +2008-12-09 |
2103 | +YK: fixed "Row_sent: 0" problem at microslow_innodb.patch |
2104 | -diff -r 23e5576aa59a pstack/Makefile.in |
2105 | ---- a/pstack/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2106 | -+++ b/pstack/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2107 | -@@ -196,6 +196,7 @@ |
2108 | - LIBDL = @LIBDL@ |
2109 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2110 | - LIBOBJS = @LIBOBJS@ |
2111 | -+LIBRT = @LIBRT@ |
2112 | - LIBS = @LIBS@ |
2113 | - LIBTOOL = @LIBTOOL@ |
2114 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2115 | -diff -r 23e5576aa59a pstack/aout/Makefile.in |
2116 | ---- a/pstack/aout/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2117 | -+++ b/pstack/aout/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2118 | -@@ -134,6 +134,7 @@ |
2119 | - LIBDL = @LIBDL@ |
2120 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2121 | - LIBOBJS = @LIBOBJS@ |
2122 | -+LIBRT = @LIBRT@ |
2123 | - LIBS = @LIBS@ |
2124 | - LIBTOOL = @LIBTOOL@ |
2125 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2126 | -diff -r 23e5576aa59a regex/Makefile.in |
2127 | ---- a/regex/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2128 | -+++ b/regex/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2129 | -@@ -180,6 +180,7 @@ |
2130 | - LIBDL = @LIBDL@ |
2131 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2132 | - LIBOBJS = @LIBOBJS@ |
2133 | -+LIBRT = @LIBRT@ |
2134 | - LIBS = @LIBS@ |
2135 | - LIBTOOL = @LIBTOOL@ |
2136 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2137 | -diff -r 23e5576aa59a scripts/Makefile.in |
2138 | ---- a/scripts/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2139 | -+++ b/scripts/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2140 | -@@ -176,6 +176,7 @@ |
2141 | - LIBDL = @LIBDL@ |
2142 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2143 | - LIBOBJS = @LIBOBJS@ |
2144 | -+LIBRT = @LIBRT@ |
2145 | - LIBS = @LIBS@ |
2146 | - LIBTOOL = @LIBTOOL@ |
2147 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2148 | -diff -r 23e5576aa59a server-tools/Makefile.in |
2149 | ---- a/server-tools/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2150 | -+++ b/server-tools/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2151 | -@@ -155,6 +155,7 @@ |
2152 | - LIBDL = @LIBDL@ |
2153 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2154 | - LIBOBJS = @LIBOBJS@ |
2155 | -+LIBRT = @LIBRT@ |
2156 | - LIBS = @LIBS@ |
2157 | - LIBTOOL = @LIBTOOL@ |
2158 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2159 | -diff -r 23e5576aa59a server-tools/instance-manager/Makefile.in |
2160 | ---- a/server-tools/instance-manager/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2161 | -+++ b/server-tools/instance-manager/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2162 | -@@ -205,6 +205,7 @@ |
2163 | - LIBDL = @LIBDL@ |
2164 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2165 | - LIBOBJS = @LIBOBJS@ |
2166 | -+LIBRT = @LIBRT@ |
2167 | - LIBS = @LIBS@ |
2168 | - LIBTOOL = @LIBTOOL@ |
2169 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2170 | -diff -r 23e5576aa59a sql/Makefile.in |
2171 | ---- a/sql/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2172 | -+++ b/sql/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2173 | -@@ -274,6 +274,7 @@ |
2174 | - LIBDL = @LIBDL@ |
2175 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2176 | - LIBOBJS = @LIBOBJS@ |
2177 | -+LIBRT = @LIBRT@ |
2178 | - LIBS = @LIBS@ |
2179 | - LIBTOOL = @LIBTOOL@ |
2180 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2181 | -diff -r 23e5576aa59a sql/ha_innodb.cc |
2182 | ---- a/sql/ha_innodb.cc Tue Feb 17 22:33:00 2009 -0800 |
2183 | -+++ b/sql/ha_innodb.cc Tue Feb 17 22:33:23 2009 -0800 |
2184 | -@@ -3324,6 +3324,8 @@ |
2185 | +Index: mysql-5.0.77/pstack/Makefile.in |
2186 | +=================================================================== |
2187 | +--- mysql-5.0.77.orig/pstack/Makefile.in |
2188 | ++++ mysql-5.0.77/pstack/Makefile.in |
2189 | +@@ -196,6 +196,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2190 | + LIBDL = @LIBDL@ |
2191 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2192 | + LIBOBJS = @LIBOBJS@ |
2193 | ++LIBRT = @LIBRT@ |
2194 | + LIBS = @LIBS@ |
2195 | + LIBTOOL = @LIBTOOL@ |
2196 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2197 | +Index: mysql-5.0.77/pstack/aout/Makefile.in |
2198 | +=================================================================== |
2199 | +--- mysql-5.0.77.orig/pstack/aout/Makefile.in |
2200 | ++++ mysql-5.0.77/pstack/aout/Makefile.in |
2201 | +@@ -134,6 +134,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2202 | + LIBDL = @LIBDL@ |
2203 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2204 | + LIBOBJS = @LIBOBJS@ |
2205 | ++LIBRT = @LIBRT@ |
2206 | + LIBS = @LIBS@ |
2207 | + LIBTOOL = @LIBTOOL@ |
2208 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2209 | +Index: mysql-5.0.77/regex/Makefile.in |
2210 | +=================================================================== |
2211 | +--- mysql-5.0.77.orig/regex/Makefile.in |
2212 | ++++ mysql-5.0.77/regex/Makefile.in |
2213 | +@@ -180,6 +180,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2214 | + LIBDL = @LIBDL@ |
2215 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2216 | + LIBOBJS = @LIBOBJS@ |
2217 | ++LIBRT = @LIBRT@ |
2218 | + LIBS = @LIBS@ |
2219 | + LIBTOOL = @LIBTOOL@ |
2220 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2221 | +Index: mysql-5.0.77/scripts/Makefile.in |
2222 | +=================================================================== |
2223 | +--- mysql-5.0.77.orig/scripts/Makefile.in |
2224 | ++++ mysql-5.0.77/scripts/Makefile.in |
2225 | +@@ -176,6 +176,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2226 | + LIBDL = @LIBDL@ |
2227 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2228 | + LIBOBJS = @LIBOBJS@ |
2229 | ++LIBRT = @LIBRT@ |
2230 | + LIBS = @LIBS@ |
2231 | + LIBTOOL = @LIBTOOL@ |
2232 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2233 | +Index: mysql-5.0.77/server-tools/Makefile.in |
2234 | +=================================================================== |
2235 | +--- mysql-5.0.77.orig/server-tools/Makefile.in |
2236 | ++++ mysql-5.0.77/server-tools/Makefile.in |
2237 | +@@ -155,6 +155,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2238 | + LIBDL = @LIBDL@ |
2239 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2240 | + LIBOBJS = @LIBOBJS@ |
2241 | ++LIBRT = @LIBRT@ |
2242 | + LIBS = @LIBS@ |
2243 | + LIBTOOL = @LIBTOOL@ |
2244 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2245 | +Index: mysql-5.0.77/server-tools/instance-manager/Makefile.in |
2246 | +=================================================================== |
2247 | +--- mysql-5.0.77.orig/server-tools/instance-manager/Makefile.in |
2248 | ++++ mysql-5.0.77/server-tools/instance-manager/Makefile.in |
2249 | +@@ -205,6 +205,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2250 | + LIBDL = @LIBDL@ |
2251 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2252 | + LIBOBJS = @LIBOBJS@ |
2253 | ++LIBRT = @LIBRT@ |
2254 | + LIBS = @LIBS@ |
2255 | + LIBTOOL = @LIBTOOL@ |
2256 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2257 | +Index: mysql-5.0.77/sql/Makefile.in |
2258 | +=================================================================== |
2259 | +--- mysql-5.0.77.orig/sql/Makefile.in |
2260 | ++++ mysql-5.0.77/sql/Makefile.in |
2261 | +@@ -274,6 +274,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2262 | + LIBDL = @LIBDL@ |
2263 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2264 | + LIBOBJS = @LIBOBJS@ |
2265 | ++LIBRT = @LIBRT@ |
2266 | + LIBS = @LIBS@ |
2267 | + LIBTOOL = @LIBTOOL@ |
2268 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2269 | +Index: mysql-5.0.77/sql/ha_innodb.cc |
2270 | +=================================================================== |
2271 | +--- mysql-5.0.77.orig/sql/ha_innodb.cc |
2272 | ++++ mysql-5.0.77/sql/ha_innodb.cc |
2273 | +@@ -3324,6 +3324,8 @@ no_commit: |
2274 | |
2275 | error = row_insert_for_mysql((byte*) record, prebuilt); |
2276 | |
2277 | @@ -1419,7 +1512,7 @@ |
2278 | if (error == DB_SUCCESS && auto_inc_used) { |
2279 | |
2280 | /* Fetch the value that was set in the autoincrement field */ |
2281 | -@@ -3596,6 +3598,8 @@ |
2282 | +@@ -3596,6 +3598,8 @@ ha_innobase::update_row( |
2283 | } |
2284 | } |
2285 | |
2286 | @@ -1428,16 +1521,16 @@ |
2287 | innodb_srv_conc_exit_innodb(prebuilt->trx); |
2288 | |
2289 | error = convert_error_code_to_mysql(error, user_thd); |
2290 | -@@ -3643,6 +3647,8 @@ |
2291 | - innodb_srv_conc_enter_innodb(prebuilt->trx); |
2292 | +@@ -3644,6 +3648,8 @@ ha_innobase::delete_row( |
2293 | |
2294 | error = row_update_for_mysql((byte*) record, prebuilt); |
2295 | + |
2296 | ++ if (error == DB_SUCCESS) rows_changed++; |
2297 | + |
2298 | -+ if (error == DB_SUCCESS) rows_changed++; |
2299 | - |
2300 | innodb_srv_conc_exit_innodb(prebuilt->trx); |
2301 | |
2302 | -@@ -4076,6 +4082,9 @@ |
2303 | + error = convert_error_code_to_mysql(error, user_thd); |
2304 | +@@ -4076,6 +4082,9 @@ ha_innobase::general_fetch( |
2305 | if (ret == DB_SUCCESS) { |
2306 | error = 0; |
2307 | table->status = 0; |
2308 | @@ -1447,10 +1540,11 @@ |
2309 | |
2310 | } else if (ret == DB_RECORD_NOT_FOUND) { |
2311 | error = HA_ERR_END_OF_FILE; |
2312 | -diff -r 23e5576aa59a sql/ha_myisam.cc |
2313 | ---- a/sql/ha_myisam.cc Tue Feb 17 22:33:00 2009 -0800 |
2314 | -+++ b/sql/ha_myisam.cc Tue Feb 17 22:33:23 2009 -0800 |
2315 | -@@ -670,7 +670,9 @@ |
2316 | +Index: mysql-5.0.77/sql/ha_myisam.cc |
2317 | +=================================================================== |
2318 | +--- mysql-5.0.77.orig/sql/ha_myisam.cc |
2319 | ++++ mysql-5.0.77/sql/ha_myisam.cc |
2320 | +@@ -670,7 +670,9 @@ int ha_myisam::write_row(byte * buf) |
2321 | if ((error= update_auto_increment())) |
2322 | return error; |
2323 | } |
2324 | @@ -1461,7 +1555,7 @@ |
2325 | } |
2326 | |
2327 | int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt) |
2328 | -@@ -1518,13 +1520,17 @@ |
2329 | +@@ -1518,13 +1520,17 @@ int ha_myisam::update_row(const byte * o |
2330 | statistic_increment(table->in_use->status_var.ha_update_count,&LOCK_status); |
2331 | if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE) |
2332 | table->timestamp_field->set_time(); |
2333 | @@ -1481,7 +1575,7 @@ |
2334 | } |
2335 | |
2336 | int ha_myisam::index_read(byte * buf, const byte * key, |
2337 | -@@ -1535,6 +1541,13 @@ |
2338 | +@@ -1535,6 +1541,13 @@ int ha_myisam::index_read(byte * buf, co |
2339 | &LOCK_status); |
2340 | int error=mi_rkey(file,buf,active_index, key, key_len, find_flag); |
2341 | table->status=error ? STATUS_NOT_FOUND: 0; |
2342 | @@ -1495,7 +1589,7 @@ |
2343 | return error; |
2344 | } |
2345 | |
2346 | -@@ -1545,6 +1558,13 @@ |
2347 | +@@ -1545,6 +1558,13 @@ int ha_myisam::index_read_idx(byte * buf |
2348 | &LOCK_status); |
2349 | int error=mi_rkey(file,buf,index, key, key_len, find_flag); |
2350 | table->status=error ? STATUS_NOT_FOUND: 0; |
2351 | @@ -1509,7 +1603,7 @@ |
2352 | return error; |
2353 | } |
2354 | |
2355 | -@@ -1555,6 +1575,13 @@ |
2356 | +@@ -1555,6 +1575,13 @@ int ha_myisam::index_read_last(byte * bu |
2357 | &LOCK_status); |
2358 | int error=mi_rkey(file,buf,active_index, key, key_len, HA_READ_PREFIX_LAST); |
2359 | table->status=error ? STATUS_NOT_FOUND: 0; |
2360 | @@ -1523,7 +1617,7 @@ |
2361 | return error; |
2362 | } |
2363 | |
2364 | -@@ -1565,6 +1592,13 @@ |
2365 | +@@ -1565,6 +1592,13 @@ int ha_myisam::index_next(byte * buf) |
2366 | &LOCK_status); |
2367 | int error=mi_rnext(file,buf,active_index); |
2368 | table->status=error ? STATUS_NOT_FOUND: 0; |
2369 | @@ -1537,7 +1631,7 @@ |
2370 | return error; |
2371 | } |
2372 | |
2373 | -@@ -1575,6 +1609,13 @@ |
2374 | +@@ -1575,6 +1609,13 @@ int ha_myisam::index_prev(byte * buf) |
2375 | &LOCK_status); |
2376 | int error=mi_rprev(file,buf, active_index); |
2377 | table->status=error ? STATUS_NOT_FOUND: 0; |
2378 | @@ -1551,7 +1645,7 @@ |
2379 | return error; |
2380 | } |
2381 | |
2382 | -@@ -1585,6 +1626,13 @@ |
2383 | +@@ -1585,6 +1626,13 @@ int ha_myisam::index_first(byte * buf) |
2384 | &LOCK_status); |
2385 | int error=mi_rfirst(file, buf, active_index); |
2386 | table->status=error ? STATUS_NOT_FOUND: 0; |
2387 | @@ -1565,7 +1659,7 @@ |
2388 | return error; |
2389 | } |
2390 | |
2391 | -@@ -1595,6 +1643,13 @@ |
2392 | +@@ -1595,6 +1643,13 @@ int ha_myisam::index_last(byte * buf) |
2393 | &LOCK_status); |
2394 | int error=mi_rlast(file, buf, active_index); |
2395 | table->status=error ? STATUS_NOT_FOUND: 0; |
2396 | @@ -1579,7 +1673,7 @@ |
2397 | return error; |
2398 | } |
2399 | |
2400 | -@@ -1611,6 +1666,13 @@ |
2401 | +@@ -1611,6 +1666,13 @@ int ha_myisam::index_next_same(byte * bu |
2402 | error= mi_rnext_same(file,buf); |
2403 | } while (error == HA_ERR_RECORD_DELETED); |
2404 | table->status=error ? STATUS_NOT_FOUND: 0; |
2405 | @@ -1593,7 +1687,7 @@ |
2406 | return error; |
2407 | } |
2408 | |
2409 | -@@ -1628,6 +1690,7 @@ |
2410 | +@@ -1628,6 +1690,7 @@ int ha_myisam::rnd_next(byte *buf) |
2411 | &LOCK_status); |
2412 | int error=mi_scan(file, buf); |
2413 | table->status=error ? STATUS_NOT_FOUND: 0; |
2414 | @@ -1601,7 +1695,7 @@ |
2415 | return error; |
2416 | } |
2417 | |
2418 | -@@ -1642,6 +1705,7 @@ |
2419 | +@@ -1642,6 +1705,7 @@ int ha_myisam::rnd_pos(byte * buf, byte |
2420 | &LOCK_status); |
2421 | int error=mi_rrnd(file, buf, my_get_ptr(pos,ref_length)); |
2422 | table->status=error ? STATUS_NOT_FOUND: 0; |
2423 | @@ -1609,10 +1703,11 @@ |
2424 | return error; |
2425 | } |
2426 | |
2427 | -diff -r 23e5576aa59a sql/handler.cc |
2428 | ---- a/sql/handler.cc Tue Feb 17 22:33:00 2009 -0800 |
2429 | -+++ b/sql/handler.cc Tue Feb 17 22:33:23 2009 -0800 |
2430 | -@@ -725,6 +725,8 @@ |
2431 | +Index: mysql-5.0.77/sql/handler.cc |
2432 | +=================================================================== |
2433 | +--- mysql-5.0.77.orig/sql/handler.cc |
2434 | ++++ mysql-5.0.77/sql/handler.cc |
2435 | +@@ -725,6 +725,8 @@ int ha_commit_trans(THD *thd, bool all) |
2436 | if (cookie) |
2437 | tc_log->unlog(cookie, xid); |
2438 | DBUG_EXECUTE_IF("crash_commit_after", abort();); |
2439 | @@ -1621,7 +1716,7 @@ |
2440 | end: |
2441 | if (is_real_trans) |
2442 | start_waiting_global_read_lock(thd); |
2443 | -@@ -829,6 +831,7 @@ |
2444 | +@@ -829,6 +831,7 @@ int ha_rollback_trans(THD *thd, bool all |
2445 | thd->transaction.cleanup(); |
2446 | } |
2447 | } |
2448 | @@ -1629,7 +1724,7 @@ |
2449 | #endif /* USING_TRANSACTIONS */ |
2450 | if (all) |
2451 | thd->transaction_rollback_request= FALSE; |
2452 | -@@ -1212,6 +1215,7 @@ |
2453 | +@@ -1212,6 +1215,7 @@ int ha_rollback_to_savepoint(THD *thd, S |
2454 | statistic_increment(thd->status_var.ha_rollback_count,&LOCK_status); |
2455 | *ht=0; // keep it conveniently zero-filled |
2456 | } |
2457 | @@ -1637,7 +1732,7 @@ |
2458 | DBUG_RETURN(error); |
2459 | } |
2460 | |
2461 | -@@ -1442,6 +1446,8 @@ |
2462 | +@@ -1442,6 +1446,8 @@ int handler::ha_open(const char *name, i |
2463 | else |
2464 | dupp_ref=ref+ALIGN_SIZE(ref_length); |
2465 | } |
2466 | @@ -1646,7 +1741,7 @@ |
2467 | DBUG_RETURN(error); |
2468 | } |
2469 | |
2470 | -@@ -2276,6 +2282,111 @@ |
2471 | +@@ -2276,6 +2282,111 @@ int handler::index_next_same(byte *buf, |
2472 | return error; |
2473 | } |
2474 | |
2475 | @@ -1758,21 +1853,22 @@ |
2476 | |
2477 | /**************************************************************************** |
2478 | ** Some general functions that isn't in the handler class |
2479 | -diff -r 23e5576aa59a sql/handler.h |
2480 | ---- a/sql/handler.h Tue Feb 17 22:33:00 2009 -0800 |
2481 | -+++ b/sql/handler.h Tue Feb 17 22:33:23 2009 -0800 |
2482 | -@@ -30,6 +30,10 @@ |
2483 | - #if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || \ |
2484 | - defined(HAVE_NDBCLUSTER_DB) |
2485 | +Index: mysql-5.0.77/sql/handler.h |
2486 | +=================================================================== |
2487 | +--- mysql-5.0.77.orig/sql/handler.h |
2488 | ++++ mysql-5.0.77/sql/handler.h |
2489 | +@@ -32,6 +32,10 @@ |
2490 | #define USING_TRANSACTIONS |
2491 | -+#endif |
2492 | -+ |
2493 | + #endif |
2494 | + |
2495 | +#if MAX_KEY > 128 |
2496 | +#error MAX_KEY is too large. Values up to 128 are supported. |
2497 | - #endif |
2498 | - |
2499 | ++#endif |
2500 | ++ |
2501 | // the following is for checking tables |
2502 | -@@ -604,6 +608,9 @@ |
2503 | + |
2504 | + #define HA_ADMIN_ALREADY_DONE 1 |
2505 | +@@ -604,6 +608,9 @@ public: |
2506 | bool auto_increment_column_changed; |
2507 | bool implicit_emptied; /* Can be !=0 only if HEAP */ |
2508 | const COND *pushed_cond; |
2509 | @@ -1782,7 +1878,7 @@ |
2510 | |
2511 | handler(const handlerton *ht_arg, TABLE *table_arg) :table(table_arg), |
2512 | ht(ht_arg), |
2513 | -@@ -615,8 +622,10 @@ |
2514 | +@@ -615,8 +622,10 @@ public: |
2515 | ref_length(sizeof(my_off_t)), block_size(0), |
2516 | raid_type(0), ft_handler(0), inited(NONE), |
2517 | locked(FALSE), implicit_emptied(0), |
2518 | @@ -1795,7 +1891,7 @@ |
2519 | virtual ~handler(void) { DBUG_ASSERT(locked == FALSE); /* TODO: DBUG_ASSERT(inited == NONE); */ } |
2520 | virtual handler *clone(MEM_ROOT *mem_root); |
2521 | int ha_open(const char *name, int mode, int test_if_locked); |
2522 | -@@ -625,7 +634,11 @@ |
2523 | +@@ -625,7 +634,11 @@ public: |
2524 | virtual void print_error(int error, myf errflag); |
2525 | virtual bool get_error_message(int error, String *buf); |
2526 | uint get_dup_key(int error); |
2527 | @@ -1808,7 +1904,7 @@ |
2528 | virtual double scan_time() |
2529 | { return ulonglong2double(data_file_length) / IO_SIZE + 2; } |
2530 | virtual double read_time(uint index, uint ranges, ha_rows rows) |
2531 | -@@ -886,6 +899,9 @@ |
2532 | +@@ -886,6 +899,9 @@ public: |
2533 | virtual bool is_crashed() const { return 0; } |
2534 | virtual bool auto_repair() const { return 0; } |
2535 | |
2536 | @@ -1818,10 +1914,11 @@ |
2537 | /* |
2538 | default rename_table() and delete_table() rename/delete files with a |
2539 | given name and extensions from bas_ext() |
2540 | -diff -r 23e5576aa59a sql/lex.h |
2541 | ---- a/sql/lex.h Tue Feb 17 22:33:00 2009 -0800 |
2542 | -+++ b/sql/lex.h Tue Feb 17 22:33:23 2009 -0800 |
2543 | -@@ -109,6 +109,7 @@ |
2544 | +Index: mysql-5.0.77/sql/lex.h |
2545 | +=================================================================== |
2546 | +--- mysql-5.0.77.orig/sql/lex.h |
2547 | ++++ mysql-5.0.77/sql/lex.h |
2548 | +@@ -109,6 +109,7 @@ static SYMBOL symbols[] = { |
2549 | { "CHECKSUM", SYM(CHECKSUM_SYM)}, |
2550 | { "CIPHER", SYM(CIPHER_SYM)}, |
2551 | { "CLIENT", SYM(CLIENT_SYM)}, |
2552 | @@ -1829,7 +1926,7 @@ |
2553 | { "CLOSE", SYM(CLOSE_SYM)}, |
2554 | { "CODE", SYM(CODE_SYM)}, |
2555 | { "COLLATE", SYM(COLLATE_SYM)}, |
2556 | -@@ -238,6 +239,7 @@ |
2557 | +@@ -238,6 +239,7 @@ static SYMBOL symbols[] = { |
2558 | { "IN", SYM(IN_SYM)}, |
2559 | { "INDEX", SYM(INDEX_SYM)}, |
2560 | { "INDEXES", SYM(INDEXES)}, |
2561 | @@ -1837,7 +1934,7 @@ |
2562 | { "INFILE", SYM(INFILE)}, |
2563 | { "INNER", SYM(INNER_SYM)}, |
2564 | { "INNOBASE", SYM(INNOBASE_SYM)}, |
2565 | -@@ -443,6 +445,7 @@ |
2566 | +@@ -443,6 +445,7 @@ static SYMBOL symbols[] = { |
2567 | { "SIGNED", SYM(SIGNED_SYM)}, |
2568 | { "SIMPLE", SYM(SIMPLE_SYM)}, |
2569 | { "SLAVE", SYM(SLAVE)}, |
2570 | @@ -1845,7 +1942,7 @@ |
2571 | { "SNAPSHOT", SYM(SNAPSHOT_SYM)}, |
2572 | { "SMALLINT", SYM(SMALLINT)}, |
2573 | { "SOME", SYM(ANY_SYM)}, |
2574 | -@@ -488,6 +491,7 @@ |
2575 | +@@ -488,6 +491,7 @@ static SYMBOL symbols[] = { |
2576 | { "TABLE", SYM(TABLE_SYM)}, |
2577 | { "TABLES", SYM(TABLES)}, |
2578 | { "TABLESPACE", SYM(TABLESPACE)}, |
2579 | @@ -1853,7 +1950,7 @@ |
2580 | { "TEMPORARY", SYM(TEMPORARY)}, |
2581 | { "TEMPTABLE", SYM(TEMPTABLE_SYM)}, |
2582 | { "TERMINATED", SYM(TERMINATED)}, |
2583 | -@@ -525,6 +529,7 @@ |
2584 | +@@ -525,6 +529,7 @@ static SYMBOL symbols[] = { |
2585 | { "USE", SYM(USE_SYM)}, |
2586 | { "USER", SYM(USER)}, |
2587 | { "USER_RESOURCES", SYM(RESOURCES)}, |
2588 | @@ -1861,10 +1958,11 @@ |
2589 | { "USE_FRM", SYM(USE_FRM)}, |
2590 | { "USING", SYM(USING)}, |
2591 | { "UTC_DATE", SYM(UTC_DATE_SYM)}, |
2592 | -diff -r 23e5576aa59a sql/log.cc |
2593 | ---- a/sql/log.cc Tue Feb 17 22:33:00 2009 -0800 |
2594 | -+++ b/sql/log.cc Tue Feb 17 22:33:23 2009 -0800 |
2595 | -@@ -1954,18 +1954,24 @@ |
2596 | +Index: mysql-5.0.77/sql/log.cc |
2597 | +=================================================================== |
2598 | +--- mysql-5.0.77.orig/sql/log.cc |
2599 | ++++ mysql-5.0.77/sql/log.cc |
2600 | +@@ -1954,18 +1954,24 @@ bool MYSQL_LOG::write(Log_event *event_i |
2601 | thd->current_insert_id); |
2602 | if (e.write(file)) |
2603 | goto err; |
2604 | @@ -1889,7 +1987,7 @@ |
2605 | } |
2606 | if (thd->user_var_events.elements) |
2607 | { |
2608 | -@@ -1981,6 +1987,8 @@ |
2609 | +@@ -1981,6 +1987,8 @@ bool MYSQL_LOG::write(Log_event *event_i |
2610 | user_var_event->charset_number); |
2611 | if (e.write(file)) |
2612 | goto err; |
2613 | @@ -1898,7 +1996,7 @@ |
2614 | } |
2615 | } |
2616 | } |
2617 | -@@ -1991,6 +1999,8 @@ |
2618 | +@@ -1991,6 +1999,8 @@ bool MYSQL_LOG::write(Log_event *event_i |
2619 | |
2620 | if (event_info->write(file)) |
2621 | goto err; |
2622 | @@ -1907,7 +2005,7 @@ |
2623 | |
2624 | if (file == &log_file) // we are writing to the real log (disk) |
2625 | { |
2626 | -@@ -2112,6 +2122,7 @@ |
2627 | +@@ -2112,6 +2122,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE |
2628 | */ |
2629 | if (qinfo.write(&log_file)) |
2630 | goto err; |
2631 | @@ -1915,7 +2013,7 @@ |
2632 | |
2633 | /* Read from the file used to cache the queries .*/ |
2634 | if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) |
2635 | -@@ -2158,6 +2169,7 @@ |
2636 | +@@ -2158,6 +2169,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE |
2637 | /* write the first half of the split header */ |
2638 | if (my_b_write(&log_file, header, carry)) |
2639 | goto err; |
2640 | @@ -1923,7 +2021,7 @@ |
2641 | |
2642 | /* |
2643 | copy fixed second half of header to cache so the correct |
2644 | -@@ -2226,6 +2238,8 @@ |
2645 | +@@ -2226,6 +2238,8 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE |
2646 | /* Write data to the binary log file */ |
2647 | if (my_b_write(&log_file, cache->read_pos, length)) |
2648 | goto err; |
2649 | @@ -1932,7 +2030,7 @@ |
2650 | cache->read_pos=cache->read_end; // Mark buffer used up |
2651 | DBUG_EXECUTE_IF("half_binlogged_transaction", goto DBUG_skip_commit;); |
2652 | } while ((length=my_b_fill(cache))); |
2653 | -@@ -2234,6 +2248,8 @@ |
2654 | +@@ -2234,6 +2248,8 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE |
2655 | |
2656 | if (commit_event->write(&log_file)) |
2657 | goto err; |
2658 | @@ -1941,10 +2039,11 @@ |
2659 | #ifndef DBUG_OFF |
2660 | DBUG_skip_commit: |
2661 | #endif |
2662 | -diff -r 23e5576aa59a sql/mysql_priv.h |
2663 | ---- a/sql/mysql_priv.h Tue Feb 17 22:33:00 2009 -0800 |
2664 | -+++ b/sql/mysql_priv.h Tue Feb 17 22:33:23 2009 -0800 |
2665 | -@@ -823,7 +823,15 @@ |
2666 | +Index: mysql-5.0.77/sql/mysql_priv.h |
2667 | +=================================================================== |
2668 | +--- mysql-5.0.77.orig/sql/mysql_priv.h |
2669 | ++++ mysql-5.0.77/sql/mysql_priv.h |
2670 | +@@ -823,7 +823,15 @@ void mysql_init_multi_delete(LEX *lex); |
2671 | bool multi_delete_set_locks_and_link_aux_tables(LEX *lex); |
2672 | void init_max_user_conn(void); |
2673 | void init_update_queries(void); |
2674 | @@ -1960,7 +2059,7 @@ |
2675 | pthread_handler_t handle_one_connection(void *arg); |
2676 | pthread_handler_t handle_bootstrap(void *arg); |
2677 | void end_thread(THD *thd,bool put_in_cache); |
2678 | -@@ -1402,6 +1410,7 @@ |
2679 | +@@ -1402,6 +1410,7 @@ extern ulong table_cache_size; |
2680 | extern ulong max_connections,max_connect_errors, connect_timeout; |
2681 | extern ulong slave_net_timeout, slave_trans_retries; |
2682 | extern uint max_user_connections; |
2683 | @@ -1968,7 +2067,7 @@ |
2684 | extern ulong what_to_log,flush_time; |
2685 | extern ulong query_buff_size, thread_stack; |
2686 | extern ulong max_prepared_stmt_count, prepared_stmt_count; |
2687 | -@@ -1432,6 +1441,7 @@ |
2688 | +@@ -1432,6 +1441,7 @@ extern my_bool opt_sql_bin_update, opt_s |
2689 | extern my_bool opt_safe_show_db, opt_local_infile; |
2690 | extern my_bool opt_slave_compressed_protocol, use_temp_pool; |
2691 | extern my_bool opt_readonly, lower_case_file_system; |
2692 | @@ -1976,7 +2075,7 @@ |
2693 | extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs; |
2694 | extern my_bool opt_secure_auth; |
2695 | extern char* opt_secure_file_priv; |
2696 | -@@ -1479,6 +1489,14 @@ |
2697 | +@@ -1479,6 +1489,14 @@ extern struct system_variables global_sy |
2698 | extern struct system_variables max_system_variables; |
2699 | extern struct system_status_var global_status_var; |
2700 | extern struct rand_struct sql_rand; |
2701 | @@ -1991,10 +2090,11 @@ |
2702 | |
2703 | extern const char *opt_date_time_formats[]; |
2704 | extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[]; |
2705 | -diff -r 23e5576aa59a sql/mysqld.cc |
2706 | ---- a/sql/mysqld.cc Tue Feb 17 22:33:00 2009 -0800 |
2707 | -+++ b/sql/mysqld.cc Tue Feb 17 22:33:23 2009 -0800 |
2708 | -@@ -415,6 +415,7 @@ |
2709 | +Index: mysql-5.0.77/sql/mysqld.cc |
2710 | +=================================================================== |
2711 | +--- mysql-5.0.77.orig/sql/mysqld.cc |
2712 | ++++ mysql-5.0.77/sql/mysqld.cc |
2713 | +@@ -415,6 +415,7 @@ my_bool opt_large_pages= 0; |
2714 | uint opt_large_page_size= 0; |
2715 | my_bool opt_old_style_user_limits= 0, trust_function_creators= 0; |
2716 | char* opt_slow_logname= 0; |
2717 | @@ -2002,7 +2102,7 @@ |
2718 | /* |
2719 | True if there is at least one per-hour limit for some user, so we should |
2720 | check them before each query (and possibly reset counters when hour is |
2721 | -@@ -451,6 +452,7 @@ |
2722 | +@@ -451,6 +452,7 @@ ulong specialflag=0; |
2723 | ulong binlog_cache_use= 0, binlog_cache_disk_use= 0; |
2724 | ulong max_connections, max_connect_errors; |
2725 | uint max_user_connections= 0; |
2726 | @@ -2010,7 +2110,7 @@ |
2727 | /* |
2728 | Limit of the total number of prepared statements in the server. |
2729 | Is necessary to protect the server against out-of-memory attacks. |
2730 | -@@ -551,6 +553,10 @@ |
2731 | +@@ -551,6 +553,10 @@ pthread_mutex_t LOCK_mysql_create_db, LO |
2732 | LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received, |
2733 | LOCK_global_system_variables, |
2734 | LOCK_user_conn, LOCK_slave_list, LOCK_active_mi; |
2735 | @@ -2021,7 +2121,7 @@ |
2736 | /* |
2737 | The below lock protects access to two global server variables: |
2738 | max_prepared_stmt_count and prepared_stmt_count. These variables |
2739 | -@@ -1192,6 +1198,10 @@ |
2740 | +@@ -1192,6 +1198,10 @@ void clean_up(bool print_message) |
2741 | x_free(opt_secure_file_priv); |
2742 | bitmap_free(&temp_pool); |
2743 | free_max_user_conn(); |
2744 | @@ -2032,7 +2132,7 @@ |
2745 | #ifdef HAVE_REPLICATION |
2746 | end_slave_list(); |
2747 | free_list(&replicate_do_db); |
2748 | -@@ -1306,6 +1316,10 @@ |
2749 | +@@ -1306,6 +1316,10 @@ static void clean_up_mutexes() |
2750 | (void) pthread_cond_destroy(&COND_thread_cache); |
2751 | (void) pthread_cond_destroy(&COND_flush_thread_cache); |
2752 | (void) pthread_cond_destroy(&COND_manager); |
2753 | @@ -2043,7 +2143,7 @@ |
2754 | } |
2755 | |
2756 | #endif /*EMBEDDED_LIBRARY*/ |
2757 | -@@ -3153,6 +3167,10 @@ |
2758 | +@@ -3153,6 +3167,10 @@ static int init_thread_environment() |
2759 | (void) pthread_mutex_init(&LOCK_rpl_status, MY_MUTEX_INIT_FAST); |
2760 | (void) pthread_cond_init(&COND_rpl_status, NULL); |
2761 | #endif |
2762 | @@ -2054,7 +2154,7 @@ |
2763 | sp_cache_init(); |
2764 | /* Parameter for threads created for connections */ |
2765 | (void) pthread_attr_init(&connection_attrib); |
2766 | -@@ -3424,6 +3442,10 @@ |
2767 | +@@ -3424,6 +3442,10 @@ server."); |
2768 | sql_print_error("Out of memory"); |
2769 | unireg_abort(1); |
2770 | } |
2771 | @@ -2065,7 +2165,7 @@ |
2772 | if (ha_init()) |
2773 | { |
2774 | sql_print_error("Can't init databases"); |
2775 | -@@ -3506,6 +3528,8 @@ |
2776 | +@@ -3506,6 +3528,8 @@ server."); |
2777 | |
2778 | init_max_user_conn(); |
2779 | init_update_queries(); |
2780 | @@ -2074,7 +2174,7 @@ |
2781 | DBUG_RETURN(0); |
2782 | } |
2783 | |
2784 | -@@ -4232,6 +4256,7 @@ |
2785 | +@@ -4232,6 +4256,7 @@ static void create_new_thread(THD *thd) |
2786 | { |
2787 | DBUG_PRINT("error",("Too many connections")); |
2788 | close_connection(thd, ER_CON_COUNT_ERROR, 1); |
2789 | @@ -2082,7 +2182,7 @@ |
2790 | delete thd; |
2791 | DBUG_VOID_RETURN; |
2792 | } |
2793 | -@@ -5050,6 +5075,7 @@ |
2794 | +@@ -5050,6 +5075,7 @@ enum options_mysqld |
2795 | OPT_PROFILING, |
2796 | OPT_SLOW_LOG, |
2797 | OPT_SLOW_QUERY_LOG_FILE, |
2798 | @@ -2090,7 +2190,7 @@ |
2799 | OPT_USE_GLOBAL_LONG_QUERY_TIME, |
2800 | OPT_INNODB_ROLLBACK_ON_TIMEOUT, |
2801 | OPT_SECURE_FILE_PRIV, |
2802 | -@@ -6498,6 +6524,10 @@ |
2803 | +@@ -6498,6 +6524,10 @@ The minimum value for this variable is 4 |
2804 | (gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG, |
2805 | REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT), |
2806 | 0, 1, 0}, |
2807 | @@ -2101,10 +2201,11 @@ |
2808 | {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} |
2809 | }; |
2810 | |
2811 | -diff -r 23e5576aa59a sql/set_var.cc |
2812 | ---- a/sql/set_var.cc Tue Feb 17 22:33:00 2009 -0800 |
2813 | -+++ b/sql/set_var.cc Tue Feb 17 22:33:23 2009 -0800 |
2814 | -@@ -325,6 +325,7 @@ |
2815 | +Index: mysql-5.0.77/sql/set_var.cc |
2816 | +=================================================================== |
2817 | +--- mysql-5.0.77.orig/sql/set_var.cc |
2818 | ++++ mysql-5.0.77/sql/set_var.cc |
2819 | +@@ -325,6 +325,7 @@ sys_var_thd_ulong sys_preload_buff |
2820 | sys_var_thd_ulong sys_read_buff_size("read_buffer_size", |
2821 | &SV::read_buff_size); |
2822 | sys_var_bool_ptr sys_readonly("read_only", &opt_readonly); |
2823 | @@ -2112,7 +2213,7 @@ |
2824 | sys_var_thd_ulong sys_read_rnd_buff_size("read_rnd_buffer_size", |
2825 | &SV::read_rnd_buff_size); |
2826 | sys_var_thd_ulong sys_div_precincrement("div_precision_increment", |
2827 | -@@ -828,6 +829,7 @@ |
2828 | +@@ -828,6 +829,7 @@ sys_var *sys_variables[]= |
2829 | &sys_trans_alloc_block_size, |
2830 | &sys_trans_prealloc_size, |
2831 | &sys_tx_isolation, |
2832 | @@ -2120,7 +2221,7 @@ |
2833 | &sys_version, |
2834 | #ifdef HAVE_BERKELEY_DB |
2835 | &sys_version_bdb, |
2836 | -@@ -1174,6 +1176,7 @@ |
2837 | +@@ -1174,6 +1176,7 @@ struct show_var_st init_vars[]= { |
2838 | {sys_tx_isolation.name, (char*) &sys_tx_isolation, SHOW_SYS}, |
2839 | {sys_updatable_views_with_limit.name, |
2840 | (char*) &sys_updatable_views_with_limit,SHOW_SYS}, |
2841 | @@ -2128,10 +2229,11 @@ |
2842 | {sys_use_global_long_query_time.name, (char*) &sys_use_global_long_query_time, SHOW_SYS}, |
2843 | {sys_version.name, (char*) &sys_version, SHOW_SYS}, |
2844 | #ifdef HAVE_BERKELEY_DB |
2845 | -diff -r 23e5576aa59a sql/share/Makefile.in |
2846 | ---- a/sql/share/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
2847 | -+++ b/sql/share/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
2848 | -@@ -144,6 +144,7 @@ |
2849 | +Index: mysql-5.0.77/sql/share/Makefile.in |
2850 | +=================================================================== |
2851 | +--- mysql-5.0.77.orig/sql/share/Makefile.in |
2852 | ++++ mysql-5.0.77/sql/share/Makefile.in |
2853 | +@@ -144,6 +144,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
2854 | LIBDL = @LIBDL@ |
2855 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
2856 | LIBOBJS = @LIBOBJS@ |
2857 | @@ -2139,10 +2241,11 @@ |
2858 | LIBS = @LIBS@ |
2859 | LIBTOOL = @LIBTOOL@ |
2860 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
2861 | -diff -r 23e5576aa59a sql/sql_base.cc |
2862 | ---- a/sql/sql_base.cc Tue Feb 17 22:33:00 2009 -0800 |
2863 | -+++ b/sql/sql_base.cc Tue Feb 17 22:33:23 2009 -0800 |
2864 | -@@ -624,6 +624,12 @@ |
2865 | +Index: mysql-5.0.77/sql/sql_base.cc |
2866 | +=================================================================== |
2867 | +--- mysql-5.0.77.orig/sql/sql_base.cc |
2868 | ++++ mysql-5.0.77/sql/sql_base.cc |
2869 | +@@ -624,6 +624,12 @@ bool close_thread_table(THD *thd, TABLE |
2870 | DBUG_ENTER("close_thread_table"); |
2871 | DBUG_ASSERT(table->key_read == 0); |
2872 | DBUG_ASSERT(!table->file || table->file->inited == handler::NONE); |
2873 | @@ -2155,7 +2258,7 @@ |
2874 | |
2875 | *table_ptr=table->next; |
2876 | if (table->needs_reopen_or_name_lock() || |
2877 | -@@ -670,6 +676,9 @@ |
2878 | +@@ -670,6 +676,9 @@ void close_temporary(TABLE *table,bool d |
2879 | { |
2880 | DBUG_ENTER("close_temporary"); |
2881 | char path[FN_REFLEN]; |
2882 | @@ -2165,10 +2268,11 @@ |
2883 | db_type table_type=table->s->db_type; |
2884 | strmov(path,table->s->path); |
2885 | free_io_cache(table); |
2886 | -diff -r 23e5576aa59a sql/sql_class.cc |
2887 | ---- a/sql/sql_class.cc Tue Feb 17 22:33:00 2009 -0800 |
2888 | -+++ b/sql/sql_class.cc Tue Feb 17 22:33:23 2009 -0800 |
2889 | -@@ -236,6 +236,13 @@ |
2890 | +Index: mysql-5.0.77/sql/sql_class.cc |
2891 | +=================================================================== |
2892 | +--- mysql-5.0.77.orig/sql/sql_class.cc |
2893 | ++++ mysql-5.0.77/sql/sql_class.cc |
2894 | +@@ -236,6 +236,13 @@ THD::THD() |
2895 | bzero(ha_data, sizeof(ha_data)); |
2896 | mysys_var=0; |
2897 | binlog_evt_union.do_union= FALSE; |
2898 | @@ -2182,7 +2286,7 @@ |
2899 | #ifndef DBUG_OFF |
2900 | dbug_sentry=THD_SENTRY_MAGIC; |
2901 | #endif |
2902 | -@@ -369,6 +376,88 @@ |
2903 | +@@ -369,6 +376,88 @@ void THD::init(void) |
2904 | total_warn_count= 0; |
2905 | update_charset(); |
2906 | bzero((char *) &status_var, sizeof(status_var)); |
2907 | @@ -2271,7 +2375,7 @@ |
2908 | } |
2909 | |
2910 | |
2911 | -@@ -408,6 +497,9 @@ |
2912 | +@@ -408,6 +497,9 @@ void THD::init_for_queries() |
2913 | |
2914 | void THD::change_user(void) |
2915 | { |
2916 | @@ -2281,7 +2385,7 @@ |
2917 | cleanup(); |
2918 | cleanup_done= 0; |
2919 | init(); |
2920 | -@@ -892,6 +984,33 @@ |
2921 | +@@ -892,6 +984,33 @@ void THD::close_active_vio() |
2922 | } |
2923 | #endif |
2924 | |
2925 | @@ -2315,7 +2419,7 @@ |
2926 | |
2927 | struct Item_change_record: public ilink |
2928 | { |
2929 | -@@ -1062,6 +1181,7 @@ |
2930 | +@@ -1062,6 +1181,7 @@ bool select_send::send_data(List<Item> & |
2931 | } |
2932 | } |
2933 | thd->sent_row_count++; |
2934 | @@ -2323,7 +2427,7 @@ |
2935 | if (!thd->vio_ok()) |
2936 | DBUG_RETURN(0); |
2937 | if (!thd->net.report_error) |
2938 | -@@ -1154,6 +1274,7 @@ |
2939 | +@@ -1154,6 +1274,7 @@ select_to_file::~select_to_file() |
2940 | select_export::~select_export() |
2941 | { |
2942 | thd->sent_row_count=row_count; |
2943 | @@ -2331,7 +2435,7 @@ |
2944 | } |
2945 | |
2946 | |
2947 | -@@ -2088,6 +2209,7 @@ |
2948 | +@@ -2088,6 +2209,7 @@ void thd_increment_bytes_sent(ulong leng |
2949 | if (likely(thd != 0)) |
2950 | { /* current_thd==0 when close_connection() calls net_send_error() */ |
2951 | thd->status_var.bytes_sent+= length; |
2952 | @@ -2339,7 +2443,7 @@ |
2953 | } |
2954 | } |
2955 | |
2956 | -@@ -2095,6 +2217,7 @@ |
2957 | +@@ -2095,6 +2217,7 @@ void thd_increment_bytes_sent(ulong leng |
2958 | void thd_increment_bytes_received(ulong length) |
2959 | { |
2960 | current_thd->status_var.bytes_received+= length; |
2961 | @@ -2347,10 +2451,11 @@ |
2962 | } |
2963 | |
2964 | |
2965 | -diff -r 23e5576aa59a sql/sql_class.h |
2966 | ---- a/sql/sql_class.h Tue Feb 17 22:33:00 2009 -0800 |
2967 | -+++ b/sql/sql_class.h Tue Feb 17 22:33:23 2009 -0800 |
2968 | -@@ -1299,6 +1299,8 @@ |
2969 | +Index: mysql-5.0.77/sql/sql_class.h |
2970 | +=================================================================== |
2971 | +--- mysql-5.0.77.orig/sql/sql_class.h |
2972 | ++++ mysql-5.0.77/sql/sql_class.h |
2973 | +@@ -1299,6 +1299,8 @@ public: |
2974 | first byte of the packet in do_command() |
2975 | */ |
2976 | enum enum_server_command command; |
2977 | @@ -2359,7 +2464,7 @@ |
2978 | uint32 server_id; |
2979 | uint32 file_id; // for LOAD DATA INFILE |
2980 | /* |
2981 | -@@ -1488,6 +1490,8 @@ |
2982 | +@@ -1488,6 +1490,8 @@ public: |
2983 | /* variables.transaction_isolation is reset to this after each commit */ |
2984 | enum_tx_isolation session_tx_isolation; |
2985 | enum_check_fields count_cuted_fields; |
2986 | @@ -2368,7 +2473,7 @@ |
2987 | |
2988 | DYNAMIC_ARRAY user_var_events; /* For user variables replication */ |
2989 | MEM_ROOT *user_var_events_alloc; /* Allocate above array elements here */ |
2990 | -@@ -1594,6 +1598,49 @@ |
2991 | +@@ -1594,6 +1598,49 @@ public: |
2992 | */ |
2993 | LOG_INFO* current_linfo; |
2994 | NET* slave_net; // network connection from slave -> m. |
2995 | @@ -2418,7 +2523,7 @@ |
2996 | /* Used by the sys_var class to store temporary values */ |
2997 | union |
2998 | { |
2999 | -@@ -1649,6 +1696,11 @@ |
3000 | +@@ -1649,6 +1696,11 @@ public: |
3001 | alloc_root. |
3002 | */ |
3003 | void init_for_queries(); |
3004 | @@ -2430,7 +2535,7 @@ |
3005 | void change_user(void); |
3006 | void cleanup(void); |
3007 | void cleanup_after_query(); |
3008 | -@@ -1878,7 +1930,13 @@ |
3009 | +@@ -1878,8 +1930,14 @@ public: |
3010 | if (p_db_length) |
3011 | *p_db_length= db_length; |
3012 | return FALSE; |
3013 | @@ -2439,12 +2544,13 @@ |
3014 | + // by 'client' as displayed by SHOW PROCESSLIST. Allocates memory from the heap of |
3015 | + // this THD and that is not reclaimed immediately, so use sparingly. May return NULL. |
3016 | } |
3017 | -+ |
3018 | + |
3019 | + char *get_client_host_port(THD *client); |
3020 | - |
3021 | ++ |
3022 | public: |
3023 | /** |
3024 | -@@ -1922,6 +1980,11 @@ |
3025 | + Add an internal error handler to the thread execution context. |
3026 | +@@ -1922,6 +1980,11 @@ private: |
3027 | MEM_ROOT main_mem_root; |
3028 | }; |
3029 | |
3030 | @@ -2456,10 +2562,11 @@ |
3031 | |
3032 | #define tmp_disable_binlog(A) \ |
3033 | {ulonglong tmp_disable_binlog__save_options= (A)->options; \ |
3034 | -diff -r 23e5576aa59a sql/sql_delete.cc |
3035 | ---- a/sql/sql_delete.cc Tue Feb 17 22:33:00 2009 -0800 |
3036 | -+++ b/sql/sql_delete.cc Tue Feb 17 22:33:23 2009 -0800 |
3037 | -@@ -358,6 +358,7 @@ |
3038 | +Index: mysql-5.0.77/sql/sql_delete.cc |
3039 | +=================================================================== |
3040 | +--- mysql-5.0.77.orig/sql/sql_delete.cc |
3041 | ++++ mysql-5.0.77/sql/sql_delete.cc |
3042 | +@@ -358,6 +358,7 @@ cleanup: |
3043 | send_ok(thd,deleted); |
3044 | DBUG_PRINT("info",("%ld records deleted",(long) deleted)); |
3045 | } |
3046 | @@ -2467,7 +2574,7 @@ |
3047 | DBUG_RETURN(error >= 0 || thd->net.report_error); |
3048 | } |
3049 | |
3050 | -@@ -869,6 +870,7 @@ |
3051 | +@@ -869,6 +870,7 @@ bool multi_delete::send_eof() |
3052 | thd->row_count_func= deleted; |
3053 | ::send_ok(thd, deleted); |
3054 | } |
3055 | @@ -2475,10 +2582,11 @@ |
3056 | return 0; |
3057 | } |
3058 | |
3059 | -diff -r 23e5576aa59a sql/sql_insert.cc |
3060 | ---- a/sql/sql_insert.cc Tue Feb 17 22:33:00 2009 -0800 |
3061 | -+++ b/sql/sql_insert.cc Tue Feb 17 22:33:23 2009 -0800 |
3062 | -@@ -989,6 +989,7 @@ |
3063 | +Index: mysql-5.0.77/sql/sql_insert.cc |
3064 | +=================================================================== |
3065 | +--- mysql-5.0.77.orig/sql/sql_insert.cc |
3066 | ++++ mysql-5.0.77/sql/sql_insert.cc |
3067 | +@@ -989,6 +989,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t |
3068 | thd->row_count_func= info.copied + info.deleted + updated; |
3069 | ::send_ok(thd, (ulong) thd->row_count_func, id, buff); |
3070 | } |
3071 | @@ -2486,7 +2594,7 @@ |
3072 | thd->abort_on_warning= 0; |
3073 | DBUG_RETURN(FALSE); |
3074 | |
3075 | -@@ -3036,6 +3037,7 @@ |
3076 | +@@ -3036,6 +3037,7 @@ bool select_insert::send_eof() |
3077 | autoinc_value_of_first_inserted_row : thd->insert_id_used ? |
3078 | thd->last_insert_id : 0; |
3079 | ::send_ok(thd, (ulong) thd->row_count_func, id, buff); |
3080 | @@ -2494,10 +2602,11 @@ |
3081 | DBUG_RETURN(0); |
3082 | } |
3083 | |
3084 | -diff -r 23e5576aa59a sql/sql_lex.h |
3085 | ---- a/sql/sql_lex.h Tue Feb 17 22:33:00 2009 -0800 |
3086 | -+++ b/sql/sql_lex.h Tue Feb 17 22:33:23 2009 -0800 |
3087 | -@@ -101,6 +101,9 @@ |
3088 | +Index: mysql-5.0.77/sql/sql_lex.h |
3089 | +=================================================================== |
3090 | +--- mysql-5.0.77.orig/sql/sql_lex.h |
3091 | ++++ mysql-5.0.77/sql/sql_lex.h |
3092 | +@@ -101,6 +101,9 @@ enum enum_sql_command { |
3093 | When a command is added here, be sure it's also added in mysqld.cc |
3094 | in "struct show_var_st status_vars[]= {" ... |
3095 | */ |
3096 | @@ -2507,10 +2616,11 @@ |
3097 | /* This should be the last !!! */ |
3098 | SQLCOM_END |
3099 | }; |
3100 | -diff -r 23e5576aa59a sql/sql_parse.cc |
3101 | ---- a/sql/sql_parse.cc Tue Feb 17 22:33:00 2009 -0800 |
3102 | -+++ b/sql/sql_parse.cc Tue Feb 17 22:33:23 2009 -0800 |
3103 | -@@ -78,6 +78,12 @@ |
3104 | +Index: mysql-5.0.77/sql/sql_parse.cc |
3105 | +=================================================================== |
3106 | +--- mysql-5.0.77.orig/sql/sql_parse.cc |
3107 | ++++ mysql-5.0.77/sql/sql_parse.cc |
3108 | +@@ -78,6 +78,12 @@ static bool append_file_to_dir(THD *thd, |
3109 | const char *table_name); |
3110 | static bool check_show_create_table_access(THD *thd, TABLE_LIST *table); |
3111 | |
3112 | @@ -2523,11 +2633,10 @@ |
3113 | const char *any_db="*any*"; // Special symbol for check_access |
3114 | |
3115 | const char *command_name[]={ |
3116 | -@@ -145,6 +151,17 @@ |
3117 | - #ifndef EMBEDDED_LIBRARY |
3118 | +@@ -146,6 +152,17 @@ static bool xa_trans_rollback(THD *thd) |
3119 | static bool do_command(THD *thd); |
3120 | #endif // EMBEDDED_LIBRARY |
3121 | -+ |
3122 | + |
3123 | +HASH global_user_stats; |
3124 | +HASH global_client_stats; |
3125 | +// Protects global_user_stats and global_client_stats |
3126 | @@ -2538,10 +2647,11 @@ |
3127 | + |
3128 | +HASH global_index_stats; |
3129 | +extern pthread_mutex_t LOCK_global_index_stats; |
3130 | - |
3131 | ++ |
3132 | #ifdef __WIN__ |
3133 | extern void win_install_sigabrt_handler(void); |
3134 | -@@ -504,6 +521,7 @@ |
3135 | + #endif |
3136 | +@@ -504,6 +521,7 @@ int check_user(THD *thd, enum enum_serve |
3137 | mysql_log.write(thd,COM_CONNECT,ER(ER_NOT_SUPPORTED_AUTH_MODE)); |
3138 | DBUG_RETURN(-1); |
3139 | } |
3140 | @@ -2549,7 +2659,7 @@ |
3141 | net_printf_error(thd, ER_ACCESS_DENIED_ERROR, |
3142 | thd->main_security_ctx.user, |
3143 | thd->main_security_ctx.host_or_ip, |
3144 | -@@ -536,12 +554,190 @@ |
3145 | +@@ -536,13 +554,191 @@ extern "C" void free_user(struct user_co |
3146 | void init_max_user_conn(void) |
3147 | { |
3148 | #ifndef NO_EMBEDDED_ACCESS_CHECKS |
3149 | @@ -2557,8 +2667,6 @@ |
3150 | - 0,0, |
3151 | - (hash_get_key) get_key_conn, (hash_free_key) free_user, |
3152 | - 0); |
3153 | --#endif |
3154 | --} |
3155 | + if (hash_init(&hash_user_connections,system_charset_info,max_connections, |
3156 | + 0,0, |
3157 | + (hash_get_key) get_key_conn, (hash_free_key) free_user, |
3158 | @@ -2566,9 +2674,9 @@ |
3159 | + sql_print_error("Initializing hash_user_connections failed."); |
3160 | + exit(1); |
3161 | + } |
3162 | -+#endif |
3163 | -+} |
3164 | -+ |
3165 | + #endif |
3166 | + } |
3167 | + |
3168 | +byte *get_key_user_stats(USER_STATS *user_stats, uint *length, |
3169 | + my_bool not_used __attribute__((unused))) |
3170 | +{ |
3171 | @@ -2743,10 +2851,11 @@ |
3172 | + } |
3173 | +} |
3174 | + |
3175 | - |
3176 | ++ |
3177 | |
3178 | /* |
3179 | -@@ -599,7 +795,10 @@ |
3180 | + check if user has already too many connections |
3181 | +@@ -599,7 +795,10 @@ static int check_for_max_user_connection |
3182 | |
3183 | end: |
3184 | if (error) |
3185 | @@ -2757,7 +2866,7 @@ |
3186 | (void) pthread_mutex_unlock(&LOCK_user_conn); |
3187 | DBUG_RETURN(error); |
3188 | } |
3189 | -@@ -646,6 +845,25 @@ |
3190 | +@@ -646,6 +845,25 @@ void free_max_user_conn(void) |
3191 | #endif /* NO_EMBEDDED_ACCESS_CHECKS */ |
3192 | } |
3193 | |
3194 | @@ -2783,7 +2892,7 @@ |
3195 | |
3196 | |
3197 | /* |
3198 | -@@ -698,6 +916,214 @@ |
3199 | +@@ -698,6 +916,214 @@ bool is_update_query(enum enum_sql_comma |
3200 | return uc_update_queries[command] != 0; |
3201 | } |
3202 | |
3203 | @@ -2998,7 +3107,7 @@ |
3204 | /* |
3205 | Reset per-hour user resource limits when it has been more than |
3206 | an hour since they were last checked |
3207 | -@@ -1184,6 +1610,8 @@ |
3208 | +@@ -1184,6 +1610,8 @@ pthread_handler_t handle_one_connection( |
3209 | my_net_set_read_timeout(net, connect_timeout); |
3210 | my_net_set_write_timeout(net, connect_timeout); |
3211 | |
3212 | @@ -3007,7 +3116,7 @@ |
3213 | if ((error=check_connection(thd))) |
3214 | { // Wrong permissions |
3215 | if (error > 0) |
3216 | -@@ -1193,8 +1621,22 @@ |
3217 | +@@ -1193,8 +1621,22 @@ pthread_handler_t handle_one_connection( |
3218 | my_sleep(1000); /* must wait after eof() */ |
3219 | #endif |
3220 | statistic_increment(aborted_connects,&LOCK_status); |
3221 | @@ -3030,7 +3139,7 @@ |
3222 | #ifdef __NETWARE__ |
3223 | netware_reg_user(sctx->ip, sctx->user, "MySQL"); |
3224 | #endif |
3225 | -@@ -1251,6 +1693,7 @@ |
3226 | +@@ -1251,6 +1693,7 @@ pthread_handler_t handle_one_connection( |
3227 | net->vio && net->error && net->report_error) |
3228 | { |
3229 | statistic_increment(aborted_threads, &LOCK_status); |
3230 | @@ -3038,7 +3147,7 @@ |
3231 | } |
3232 | |
3233 | if (net->error && net->vio != 0 && net->report_error) |
3234 | -@@ -1270,6 +1713,8 @@ |
3235 | +@@ -1270,6 +1713,8 @@ pthread_handler_t handle_one_connection( |
3236 | |
3237 | end_thread: |
3238 | close_connection(thd, 0, 1); |
3239 | @@ -3047,7 +3156,7 @@ |
3240 | end_thread(thd,1); |
3241 | /* |
3242 | If end_thread returns, we are either running with --one-thread |
3243 | -@@ -1601,6 +2046,13 @@ |
3244 | +@@ -1601,6 +2046,13 @@ static bool do_command(THD *thd) |
3245 | |
3246 | thd->clear_error(); // Clear error message |
3247 | |
3248 | @@ -3061,7 +3170,7 @@ |
3249 | net_new_transaction(net); |
3250 | |
3251 | packet_length= my_net_read(net); |
3252 | -@@ -1759,6 +2211,9 @@ |
3253 | +@@ -1759,6 +2211,9 @@ bool dispatch_command(enum enum_server_c |
3254 | } |
3255 | |
3256 | thd->command=command; |
3257 | @@ -3071,7 +3180,7 @@ |
3258 | /* |
3259 | Commands which always take a long time are logged into |
3260 | the slow log only if opt_log_slow_admin_statements is set. |
3261 | -@@ -4428,6 +4883,15 @@ |
3262 | +@@ -4428,6 +4883,15 @@ end_with_restore_list: |
3263 | if (check_global_access(thd,RELOAD_ACL)) |
3264 | goto error; |
3265 | |
3266 | @@ -3087,7 +3196,7 @@ |
3267 | /* |
3268 | reload_acl_and_cache() will tell us if we are allowed to write to the |
3269 | binlog or not. |
3270 | -@@ -4735,6 +5199,7 @@ |
3271 | +@@ -4735,6 +5199,7 @@ end_with_restore_list: |
3272 | { |
3273 | if (check_global_access(thd, SUPER_ACL)) |
3274 | { |
3275 | @@ -3095,7 +3204,7 @@ |
3276 | my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER"); |
3277 | goto create_sp_error; |
3278 | } |
3279 | -@@ -5571,6 +6036,7 @@ |
3280 | +@@ -5571,6 +6036,7 @@ check_access(THD *thd, ulong want_access |
3281 | if (!no_errors) |
3282 | { |
3283 | const char *db_name= db ? db : thd->db; |
3284 | @@ -3103,7 +3212,7 @@ |
3285 | my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), |
3286 | sctx->priv_user, sctx->priv_host, db_name); |
3287 | } |
3288 | -@@ -5606,6 +6072,7 @@ |
3289 | +@@ -5606,6 +6072,7 @@ check_access(THD *thd, ulong want_access |
3290 | { // We can never grant this |
3291 | DBUG_PRINT("error",("No possible access")); |
3292 | if (!no_errors) |
3293 | @@ -3111,7 +3220,7 @@ |
3294 | my_error(ER_ACCESS_DENIED_ERROR, MYF(0), |
3295 | sctx->priv_user, |
3296 | sctx->priv_host, |
3297 | -@@ -5638,11 +6105,15 @@ |
3298 | +@@ -5638,11 +6105,15 @@ check_access(THD *thd, ulong want_access |
3299 | |
3300 | DBUG_PRINT("error",("Access denied")); |
3301 | if (!no_errors) |
3302 | @@ -3127,7 +3236,7 @@ |
3303 | DBUG_RETURN(TRUE); /* purecov: tested */ |
3304 | #endif /* NO_EMBEDDED_ACCESS_CHECKS */ |
3305 | } |
3306 | -@@ -5676,6 +6147,7 @@ |
3307 | +@@ -5676,6 +6147,7 @@ bool check_global_access(THD *thd, ulong |
3308 | if ((thd->security_ctx->master_access & want_access)) |
3309 | return 0; |
3310 | get_privilege_desc(command, sizeof(command), want_access); |
3311 | @@ -3135,7 +3244,7 @@ |
3312 | my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command); |
3313 | return 1; |
3314 | #endif /* NO_EMBEDDED_ACCESS_CHECKS */ |
3315 | -@@ -5708,6 +6180,7 @@ |
3316 | +@@ -5708,6 +6180,7 @@ static bool check_show_access(THD *thd, |
3317 | |
3318 | if (!thd->col_access && check_grant_db(thd, dst_db_name)) |
3319 | { |
3320 | @@ -3143,7 +3252,7 @@ |
3321 | my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), |
3322 | thd->security_ctx->priv_user, |
3323 | thd->security_ctx->priv_host, |
3324 | -@@ -5739,6 +6212,12 @@ |
3325 | +@@ -5739,6 +6212,12 @@ static bool check_show_access(THD *thd, |
3326 | check_grant(thd, SELECT_ACL, dst_table, 2, UINT_MAX, FALSE); |
3327 | } |
3328 | |
3329 | @@ -3156,17 +3265,17 @@ |
3330 | case SCH_OPEN_TABLES: |
3331 | case SCH_VARIABLES: |
3332 | case SCH_STATUS: |
3333 | -@@ -5792,8 +6271,8 @@ |
3334 | +@@ -5792,8 +6271,8 @@ check_table_access(THD *thd, ulong want_ |
3335 | #ifndef NO_EMBEDDED_ACCESS_CHECKS |
3336 | TABLE_LIST *org_tables= tables; |
3337 | #endif |
3338 | -+ Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx; |
3339 | - TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table(); |
3340 | -- Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx; |
3341 | +- TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table(); |
3342 | + Security_context *sctx= thd->security_ctx, *backup_ctx= thd->security_ctx; |
3343 | ++ TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table(); |
3344 | /* |
3345 | The check that first_not_own_table is not reached is for the case when |
3346 | the given table list refers to the list for prelocking (contains tables |
3347 | -@@ -5810,9 +6289,12 @@ |
3348 | +@@ -5810,9 +6289,12 @@ check_table_access(THD *thd, ulong want_ |
3349 | (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL))) |
3350 | { |
3351 | if (!no_errors) |
3352 | @@ -3179,11 +3288,10 @@ |
3353 | return TRUE; |
3354 | } |
3355 | /* |
3356 | -@@ -6321,6 +6803,30 @@ |
3357 | - */ |
3358 | +@@ -6322,6 +6804,30 @@ void mysql_parse(THD *thd, const char *i |
3359 | lex_start(thd); |
3360 | mysql_reset_thd_for_next_command(thd); |
3361 | -+ |
3362 | + |
3363 | + int start_time_error = 0; |
3364 | + int end_time_error = 0; |
3365 | + struct timeval start_time, end_time; |
3366 | @@ -3207,10 +3315,11 @@ |
3367 | + start_usecs = start_time.tv_sec * 1000000.0 + start_time.tv_usec; |
3368 | + } |
3369 | + } |
3370 | - |
3371 | ++ |
3372 | if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0) |
3373 | { |
3374 | -@@ -6400,6 +6906,43 @@ |
3375 | + LEX *lex= thd->lex; |
3376 | +@@ -6400,6 +6906,43 @@ void mysql_parse(THD *thd, const char *i |
3377 | *found_semicolon= NULL; |
3378 | } |
3379 | |
3380 | @@ -3254,7 +3363,7 @@ |
3381 | DBUG_VOID_RETURN; |
3382 | } |
3383 | |
3384 | -@@ -7411,8 +7954,35 @@ |
3385 | +@@ -7411,8 +7954,35 @@ bool reload_acl_and_cache(THD *thd, ulon |
3386 | pthread_mutex_unlock(&LOCK_active_mi); |
3387 | } |
3388 | #endif |
3389 | @@ -3292,20 +3401,21 @@ |
3390 | *write_to_binlog= tmp_write_to_binlog; |
3391 | return result; |
3392 | } |
3393 | -diff -r 23e5576aa59a sql/sql_prepare.cc |
3394 | ---- a/sql/sql_prepare.cc Tue Feb 17 22:33:00 2009 -0800 |
3395 | -+++ b/sql/sql_prepare.cc Tue Feb 17 22:33:23 2009 -0800 |
3396 | -@@ -80,6 +80,9 @@ |
3397 | - #else |
3398 | +Index: mysql-5.0.77/sql/sql_prepare.cc |
3399 | +=================================================================== |
3400 | +--- mysql-5.0.77.orig/sql/sql_prepare.cc |
3401 | ++++ mysql-5.0.77/sql/sql_prepare.cc |
3402 | +@@ -81,6 +81,9 @@ When one supplies long data for a placeh |
3403 | #include <mysql_com.h> |
3404 | #endif |
3405 | -+ |
3406 | + |
3407 | +// Uses the THD to update the global stats by user name and client IP |
3408 | +void update_global_user_stats(THD* thd, bool create_user, time_t now); |
3409 | - |
3410 | ++ |
3411 | /* A result class used to send cursor rows using the binary protocol. */ |
3412 | |
3413 | -@@ -1910,8 +1913,32 @@ |
3414 | + class Select_fetch_protocol_prep: public select_send |
3415 | +@@ -1910,8 +1913,32 @@ void mysql_stmt_prepare(THD *thd, const |
3416 | /* First of all clear possible warnings from the previous command */ |
3417 | mysql_reset_thd_for_next_command(thd); |
3418 | |
3419 | @@ -3339,7 +3449,7 @@ |
3420 | |
3421 | if (thd->stmt_map.insert(thd, stmt)) |
3422 | { |
3423 | -@@ -1919,7 +1946,7 @@ |
3424 | +@@ -1919,7 +1946,7 @@ void mysql_stmt_prepare(THD *thd, const |
3425 | The error is set in the insert. The statement itself |
3426 | will be also deleted there (this is how the hash works). |
3427 | */ |
3428 | @@ -3348,7 +3458,7 @@ |
3429 | } |
3430 | |
3431 | /* Reset warnings from previous command */ |
3432 | -@@ -1941,6 +1968,44 @@ |
3433 | +@@ -1941,6 +1968,44 @@ void mysql_stmt_prepare(THD *thd, const |
3434 | thd->stmt_map.erase(stmt); |
3435 | } |
3436 | /* check_prepared_statemnt sends the metadata packet in case of success */ |
3437 | @@ -3393,7 +3503,7 @@ |
3438 | DBUG_VOID_RETURN; |
3439 | } |
3440 | |
3441 | -@@ -2281,8 +2346,32 @@ |
3442 | +@@ -2281,8 +2346,32 @@ void mysql_stmt_execute(THD *thd, char * |
3443 | /* First of all clear possible warnings from the previous command */ |
3444 | mysql_reset_thd_for_next_command(thd); |
3445 | |
3446 | @@ -3427,7 +3537,7 @@ |
3447 | |
3448 | #ifdef ENABLED_PROFILING |
3449 | thd->profiling.set_query_source(stmt->query, stmt->query_length); |
3450 | -@@ -2325,11 +2414,50 @@ |
3451 | +@@ -2325,11 +2414,50 @@ void mysql_stmt_execute(THD *thd, char * |
3452 | test(flags & (ulong) CURSOR_TYPE_READ_ONLY)); |
3453 | if (!(specialflag & SPECIAL_NO_PRIOR)) |
3454 | my_pthread_setprio(pthread_self(), WAIT_PRIOR); |
3455 | @@ -3479,7 +3589,7 @@ |
3456 | DBUG_VOID_RETURN; |
3457 | } |
3458 | |
3459 | -@@ -2423,6 +2551,31 @@ |
3460 | +@@ -2423,6 +2551,31 @@ void mysql_stmt_fetch(THD *thd, char *pa |
3461 | |
3462 | /* First of all clear possible warnings from the previous command */ |
3463 | mysql_reset_thd_for_next_command(thd); |
3464 | @@ -3511,7 +3621,7 @@ |
3465 | statistic_increment(thd->status_var.com_stmt_fetch, &LOCK_status); |
3466 | if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_fetch"))) |
3467 | DBUG_VOID_RETURN; |
3468 | -@@ -2455,6 +2608,43 @@ |
3469 | +@@ -2455,6 +2608,43 @@ void mysql_stmt_fetch(THD *thd, char *pa |
3470 | thd->restore_backup_statement(stmt, &stmt_backup); |
3471 | thd->stmt_arena= thd; |
3472 | |
3473 | @@ -3555,7 +3665,7 @@ |
3474 | DBUG_VOID_RETURN; |
3475 | } |
3476 | |
3477 | -@@ -2487,6 +2677,30 @@ |
3478 | +@@ -2487,6 +2677,30 @@ void mysql_stmt_reset(THD *thd, char *pa |
3479 | /* First of all clear possible warnings from the previous command */ |
3480 | mysql_reset_thd_for_next_command(thd); |
3481 | |
3482 | @@ -3586,11 +3696,10 @@ |
3483 | statistic_increment(thd->status_var.com_stmt_reset, &LOCK_status); |
3484 | if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_reset"))) |
3485 | DBUG_VOID_RETURN; |
3486 | -@@ -2502,6 +2716,43 @@ |
3487 | - stmt->state= Query_arena::PREPARED; |
3488 | +@@ -2503,6 +2717,43 @@ void mysql_stmt_reset(THD *thd, char *pa |
3489 | |
3490 | send_ok(thd); |
3491 | -+ |
3492 | + |
3493 | + if (opt_userstat_running) { |
3494 | + // Gets the end time. |
3495 | + if (!(end_time_error = gettimeofday(&end_time, NULL))) { |
3496 | @@ -3627,13 +3736,15 @@ |
3497 | + // Updates THD stats and the global user stats. |
3498 | + thd->update_stats(true); |
3499 | + update_global_user_stats(thd, true, time(NULL)); |
3500 | - |
3501 | ++ |
3502 | DBUG_VOID_RETURN; |
3503 | } |
3504 | -diff -r 23e5576aa59a sql/sql_show.cc |
3505 | ---- a/sql/sql_show.cc Tue Feb 17 22:33:00 2009 -0800 |
3506 | -+++ b/sql/sql_show.cc Tue Feb 17 22:33:23 2009 -0800 |
3507 | -@@ -530,6 +530,7 @@ |
3508 | + |
3509 | +Index: mysql-5.0.77/sql/sql_show.cc |
3510 | +=================================================================== |
3511 | +--- mysql-5.0.77.orig/sql/sql_show.cc |
3512 | ++++ mysql-5.0.77/sql/sql_show.cc |
3513 | +@@ -530,6 +530,7 @@ bool mysqld_show_create_db(THD *thd, cha |
3514 | sctx->master_access); |
3515 | if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname))) |
3516 | { |
3517 | @@ -3641,7 +3752,7 @@ |
3518 | my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), |
3519 | sctx->priv_user, sctx->host_or_ip, dbname); |
3520 | mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR), |
3521 | -@@ -1872,6 +1873,300 @@ |
3522 | +@@ -1872,6 +1873,300 @@ static bool show_status_array(THD *thd, |
3523 | DBUG_RETURN(FALSE); |
3524 | } |
3525 | |
3526 | @@ -3942,13 +4053,13 @@ |
3527 | |
3528 | /* collect status for all running threads */ |
3529 | |
3530 | -@@ -4482,6 +4777,77 @@ |
3531 | +@@ -4482,6 +4777,77 @@ ST_FIELD_INFO variables_fields_info[]= |
3532 | {0, 0, MYSQL_TYPE_STRING, 0, 0, 0} |
3533 | }; |
3534 | |
3535 | +ST_FIELD_INFO user_stats_fields_info[]= |
3536 | +{ |
3537 | -+ {"USER", 16, MYSQL_TYPE_STRING, 0, 0, "User"}, |
3538 | ++ {"USER", USERNAME_LENGTH, MYSQL_TYPE_STRING, 0, 0, "User"}, |
3539 | + {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections"}, |
3540 | + {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections"}, |
3541 | + {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time"}, |
3542 | @@ -3974,7 +4085,7 @@ |
3543 | + |
3544 | +ST_FIELD_INFO client_stats_fields_info[]= |
3545 | +{ |
3546 | -+ {"CLIENT", 16, MYSQL_TYPE_STRING, 0, 0, "Client"}, |
3547 | ++ {"CLIENT", HOSTNAME_LENGTH, MYSQL_TYPE_STRING, 0, 0, "Client"}, |
3548 | + {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections"}, |
3549 | + {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections"}, |
3550 | + {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time"}, |
3551 | @@ -4020,7 +4131,7 @@ |
3552 | |
3553 | /* |
3554 | Description of ST_FIELD_INFO in table.h |
3555 | -@@ -4491,6 +4857,8 @@ |
3556 | +@@ -4491,6 +4857,8 @@ ST_SCHEMA_TABLE schema_tables[]= |
3557 | { |
3558 | {"CHARACTER_SETS", charsets_fields_info, create_schema_table, |
3559 | fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0}, |
3560 | @@ -4029,7 +4140,7 @@ |
3561 | {"COLLATIONS", collation_fields_info, create_schema_table, |
3562 | fill_schema_collation, make_old_format, 0, -1, -1, 0}, |
3563 | {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info, |
3564 | -@@ -4499,6 +4867,8 @@ |
3565 | +@@ -4499,6 +4867,8 @@ ST_SCHEMA_TABLE schema_tables[]= |
3566 | get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0}, |
3567 | {"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table, |
3568 | fill_schema_column_privileges, 0, 0, -1, -1, 0}, |
3569 | @@ -4038,7 +4149,7 @@ |
3570 | {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table, |
3571 | get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0}, |
3572 | {"OPEN_TABLES", open_tables_fields_info, create_schema_table, |
3573 | -@@ -4524,10 +4894,14 @@ |
3574 | +@@ -4524,10 +4894,14 @@ ST_SCHEMA_TABLE schema_tables[]= |
3575 | get_all_tables, make_table_names_old_format, 0, 1, 2, 1}, |
3576 | {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table, |
3577 | fill_schema_table_privileges, 0, 0, -1, -1, 0}, |
3578 | @@ -4053,10 +4164,11 @@ |
3579 | {"VARIABLES", variables_fields_info, create_schema_table, fill_variables, |
3580 | make_old_format, 0, -1, -1, 1}, |
3581 | {"VIEWS", view_fields_info, create_schema_table, |
3582 | -diff -r 23e5576aa59a sql/sql_update.cc |
3583 | ---- a/sql/sql_update.cc Tue Feb 17 22:33:00 2009 -0800 |
3584 | -+++ b/sql/sql_update.cc Tue Feb 17 22:33:23 2009 -0800 |
3585 | -@@ -601,7 +601,8 @@ |
3586 | +Index: mysql-5.0.77/sql/sql_update.cc |
3587 | +=================================================================== |
3588 | +--- mysql-5.0.77.orig/sql/sql_update.cc |
3589 | ++++ mysql-5.0.77/sql/sql_update.cc |
3590 | +@@ -601,7 +601,8 @@ int mysql_update(THD *thd, |
3591 | (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated; |
3592 | send_ok(thd, (ulong) thd->row_count_func, |
3593 | thd->insert_id_used ? thd->last_insert_id : 0L,buff); |
3594 | @@ -4066,17 +4178,18 @@ |
3595 | } |
3596 | thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */ |
3597 | thd->abort_on_warning= 0; |
3598 | -@@ -1832,5 +1833,6 @@ |
3599 | +@@ -1832,5 +1833,6 @@ bool multi_update::send_eof() |
3600 | (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated; |
3601 | ::send_ok(thd, (ulong) thd->row_count_func, |
3602 | thd->insert_id_used ? thd->last_insert_id : 0L,buff); |
3603 | + thd->updated_row_count += thd->row_count_func; |
3604 | return FALSE; |
3605 | } |
3606 | -diff -r 23e5576aa59a sql/sql_yacc.yy |
3607 | ---- a/sql/sql_yacc.yy Tue Feb 17 22:33:00 2009 -0800 |
3608 | -+++ b/sql/sql_yacc.yy Tue Feb 17 22:33:23 2009 -0800 |
3609 | -@@ -523,6 +523,7 @@ |
3610 | +Index: mysql-5.0.77/sql/sql_yacc.yy |
3611 | +=================================================================== |
3612 | +--- mysql-5.0.77.orig/sql/sql_yacc.yy |
3613 | ++++ mysql-5.0.77/sql/sql_yacc.yy |
3614 | +@@ -523,6 +523,7 @@ bool my_yyoverflow(short **a, YYSTYPE ** |
3615 | %token CHECK_SYM |
3616 | %token CIPHER_SYM |
3617 | %token CLIENT_SYM |
3618 | @@ -4084,7 +4197,7 @@ |
3619 | %token CLOSE_SYM |
3620 | %token COALESCE |
3621 | %token CODE_SYM |
3622 | -@@ -680,6 +681,7 @@ |
3623 | +@@ -680,6 +681,7 @@ bool my_yyoverflow(short **a, YYSTYPE ** |
3624 | %token IMPORT |
3625 | %token INDEXES |
3626 | %token INDEX_SYM |
3627 | @@ -4092,7 +4205,7 @@ |
3628 | %token INFILE |
3629 | %token INNER_SYM |
3630 | %token INNOBASE_SYM |
3631 | -@@ -909,6 +911,7 @@ |
3632 | +@@ -909,6 +911,7 @@ bool my_yyoverflow(short **a, YYSTYPE ** |
3633 | %token SIGNED_SYM |
3634 | %token SIMPLE_SYM |
3635 | %token SLAVE |
3636 | @@ -4100,7 +4213,7 @@ |
3637 | %token SMALLINT |
3638 | %token SNAPSHOT_SYM |
3639 | %token SOUNDS_SYM |
3640 | -@@ -949,6 +952,7 @@ |
3641 | +@@ -949,6 +952,7 @@ bool my_yyoverflow(short **a, YYSTYPE ** |
3642 | %token TABLES |
3643 | %token TABLESPACE |
3644 | %token TABLE_SYM |
3645 | @@ -4108,7 +4221,7 @@ |
3646 | %token TEMPORARY |
3647 | %token TEMPTABLE_SYM |
3648 | %token TERMINATED |
3649 | -@@ -991,6 +995,7 @@ |
3650 | +@@ -991,6 +995,7 @@ bool my_yyoverflow(short **a, YYSTYPE ** |
3651 | %token UPGRADE_SYM |
3652 | %token USAGE |
3653 | %token USER |
3654 | @@ -4116,7 +4229,7 @@ |
3655 | %token USE_FRM |
3656 | %token USE_SYM |
3657 | %token USING |
3658 | -@@ -8244,6 +8249,38 @@ |
3659 | +@@ -8244,6 +8249,38 @@ show_param: |
3660 | { |
3661 | Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; |
3662 | } |
3663 | @@ -4155,7 +4268,7 @@ |
3664 | | CREATE PROCEDURE sp_name |
3665 | { |
3666 | LEX *lex= Lex; |
3667 | -@@ -8448,9 +8485,14 @@ |
3668 | +@@ -8448,9 +8485,14 @@ flush_option: |
3669 | | LOGS_SYM { Lex->type|= REFRESH_LOG; } |
3670 | | STATUS_SYM { Lex->type|= REFRESH_STATUS; } |
3671 | | SLAVE { Lex->type|= REFRESH_SLAVE; } |
3672 | @@ -4171,7 +4284,7 @@ |
3673 | |
3674 | opt_table_list: |
3675 | /* empty */ {;} |
3676 | -@@ -9439,6 +9481,7 @@ |
3677 | +@@ -9439,6 +9481,7 @@ keyword_sp: |
3678 | | CHAIN_SYM {} |
3679 | | CHANGED {} |
3680 | | CIPHER_SYM {} |
3681 | @@ -4179,7 +4292,7 @@ |
3682 | | CLIENT_SYM {} |
3683 | | CODE_SYM {} |
3684 | | COLLATION_SYM {} |
3685 | -@@ -9491,6 +9534,7 @@ |
3686 | +@@ -9491,6 +9534,7 @@ keyword_sp: |
3687 | | HOSTS_SYM {} |
3688 | | HOUR_SYM {} |
3689 | | IDENTIFIED_SYM {} |
3690 | @@ -4187,7 +4300,7 @@ |
3691 | | INVOKER_SYM {} |
3692 | | IMPORT {} |
3693 | | INDEXES {} |
3694 | -@@ -9600,6 +9644,7 @@ |
3695 | +@@ -9600,6 +9644,7 @@ keyword_sp: |
3696 | | SIMPLE_SYM {} |
3697 | | SHARE_SYM {} |
3698 | | SHUTDOWN {} |
3699 | @@ -4195,7 +4308,7 @@ |
3700 | | SNAPSHOT_SYM {} |
3701 | | SOUNDS_SYM {} |
3702 | | SOURCE_SYM {} |
3703 | -@@ -9616,6 +9661,7 @@ |
3704 | +@@ -9616,6 +9661,7 @@ keyword_sp: |
3705 | | SUSPEND_SYM {} |
3706 | | SWAPS_SYM {} |
3707 | | SWITCHES_SYM {} |
3708 | @@ -4203,7 +4316,7 @@ |
3709 | | TABLES {} |
3710 | | TABLESPACE {} |
3711 | | TEMPORARY {} |
3712 | -@@ -9636,6 +9682,7 @@ |
3713 | +@@ -9636,6 +9682,7 @@ keyword_sp: |
3714 | | UNKNOWN_SYM {} |
3715 | | UNTIL_SYM {} |
3716 | | USER {} |
3717 | @@ -4211,18 +4324,19 @@ |
3718 | | USE_FRM {} |
3719 | | VARIABLES {} |
3720 | | VIEW_SYM {} |
3721 | -diff -r 23e5576aa59a sql/structs.h |
3722 | ---- a/sql/structs.h Tue Feb 17 22:33:00 2009 -0800 |
3723 | -+++ b/sql/structs.h Tue Feb 17 22:33:23 2009 -0800 |
3724 | -@@ -273,6 +273,98 @@ |
3725 | +Index: mysql-5.0.77/sql/structs.h |
3726 | +=================================================================== |
3727 | +--- mysql-5.0.77.orig/sql/structs.h |
3728 | ++++ mysql-5.0.77/sql/structs.h |
3729 | +@@ -273,6 +273,98 @@ typedef struct user_conn { |
3730 | time_t intime; |
3731 | } USER_CONN; |
3732 | |
3733 | +typedef struct st_user_stats { |
3734 | -+ char user[USERNAME_LENGTH + 1]; |
3735 | ++ char user[HOSTNAME_LENGTH + 1]; |
3736 | + // Account name the user is mapped to when this is a user from mapped_user. |
3737 | + // Otherwise, the same value as user. |
3738 | -+ char priv_user[USERNAME_LENGTH + 1]; |
3739 | ++ char priv_user[HOSTNAME_LENGTH + 1]; |
3740 | + uint total_connections; |
3741 | + uint concurrent_connections; |
3742 | + time_t connected_time; // in seconds |
3743 | @@ -4313,10 +4427,11 @@ |
3744 | /* Bits in form->update */ |
3745 | #define REG_MAKE_DUPP 1 /* Make a copy of record when read */ |
3746 | #define REG_NEW_RECORD 2 /* Write a new record if not found */ |
3747 | -diff -r 23e5576aa59a sql/table.h |
3748 | ---- a/sql/table.h Tue Feb 17 22:33:00 2009 -0800 |
3749 | -+++ b/sql/table.h Tue Feb 17 22:33:23 2009 -0800 |
3750 | -@@ -371,10 +371,12 @@ |
3751 | +Index: mysql-5.0.77/sql/table.h |
3752 | +=================================================================== |
3753 | +--- mysql-5.0.77.orig/sql/table.h |
3754 | ++++ mysql-5.0.77/sql/table.h |
3755 | +@@ -371,10 +371,12 @@ typedef struct st_foreign_key_info |
3756 | enum enum_schema_tables |
3757 | { |
3758 | SCH_CHARSETS= 0, |
3759 | @@ -4329,7 +4444,7 @@ |
3760 | SCH_KEY_COLUMN_USAGE, |
3761 | SCH_OPEN_TABLES, |
3762 | SCH_PROFILES, |
3763 | -@@ -387,8 +389,10 @@ |
3764 | +@@ -387,8 +389,10 @@ enum enum_schema_tables |
3765 | SCH_TABLE_CONSTRAINTS, |
3766 | SCH_TABLE_NAMES, |
3767 | SCH_TABLE_PRIVILEGES, |
3768 | @@ -4340,54 +4455,59 @@ |
3769 | SCH_VARIABLES, |
3770 | SCH_VIEWS |
3771 | }; |
3772 | -diff -r 23e5576aa59a strings/Makefile.in |
3773 | ---- a/strings/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3774 | -+++ b/strings/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3775 | -@@ -342,6 +342,7 @@ |
3776 | - LIBDL = @LIBDL@ |
3777 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3778 | - LIBOBJS = @LIBOBJS@ |
3779 | -+LIBRT = @LIBRT@ |
3780 | - LIBS = @LIBS@ |
3781 | - LIBTOOL = @LIBTOOL@ |
3782 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3783 | -diff -r 23e5576aa59a support-files/MacOSX/Makefile.in |
3784 | ---- a/support-files/MacOSX/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3785 | -+++ b/support-files/MacOSX/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3786 | -@@ -148,6 +148,7 @@ |
3787 | - LIBDL = @LIBDL@ |
3788 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3789 | - LIBOBJS = @LIBOBJS@ |
3790 | -+LIBRT = @LIBRT@ |
3791 | - LIBS = @LIBS@ |
3792 | - LIBTOOL = @LIBTOOL@ |
3793 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3794 | -diff -r 23e5576aa59a support-files/Makefile.in |
3795 | ---- a/support-files/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3796 | -+++ b/support-files/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3797 | -@@ -171,6 +171,7 @@ |
3798 | - LIBDL = @LIBDL@ |
3799 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3800 | - LIBOBJS = @LIBOBJS@ |
3801 | -+LIBRT = @LIBRT@ |
3802 | - LIBS = @LIBS@ |
3803 | - LIBTOOL = @LIBTOOL@ |
3804 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3805 | -diff -r 23e5576aa59a support-files/RHEL4-SElinux/Makefile.in |
3806 | ---- a/support-files/RHEL4-SElinux/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3807 | -+++ b/support-files/RHEL4-SElinux/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3808 | -@@ -146,6 +146,7 @@ |
3809 | - LIBDL = @LIBDL@ |
3810 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3811 | - LIBOBJS = @LIBOBJS@ |
3812 | -+LIBRT = @LIBRT@ |
3813 | - LIBS = @LIBS@ |
3814 | - LIBTOOL = @LIBTOOL@ |
3815 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3816 | -diff -r 23e5576aa59a tests/Makefile.in |
3817 | ---- a/tests/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3818 | -+++ b/tests/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3819 | -@@ -193,6 +193,7 @@ |
3820 | +Index: mysql-5.0.77/strings/Makefile.in |
3821 | +=================================================================== |
3822 | +--- mysql-5.0.77.orig/strings/Makefile.in |
3823 | ++++ mysql-5.0.77/strings/Makefile.in |
3824 | +@@ -342,6 +342,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3825 | + LIBDL = @LIBDL@ |
3826 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3827 | + LIBOBJS = @LIBOBJS@ |
3828 | ++LIBRT = @LIBRT@ |
3829 | + LIBS = @LIBS@ |
3830 | + LIBTOOL = @LIBTOOL@ |
3831 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3832 | +Index: mysql-5.0.77/support-files/MacOSX/Makefile.in |
3833 | +=================================================================== |
3834 | +--- mysql-5.0.77.orig/support-files/MacOSX/Makefile.in |
3835 | ++++ mysql-5.0.77/support-files/MacOSX/Makefile.in |
3836 | +@@ -148,6 +148,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3837 | + LIBDL = @LIBDL@ |
3838 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3839 | + LIBOBJS = @LIBOBJS@ |
3840 | ++LIBRT = @LIBRT@ |
3841 | + LIBS = @LIBS@ |
3842 | + LIBTOOL = @LIBTOOL@ |
3843 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3844 | +Index: mysql-5.0.77/support-files/Makefile.in |
3845 | +=================================================================== |
3846 | +--- mysql-5.0.77.orig/support-files/Makefile.in |
3847 | ++++ mysql-5.0.77/support-files/Makefile.in |
3848 | +@@ -171,6 +171,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3849 | + LIBDL = @LIBDL@ |
3850 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3851 | + LIBOBJS = @LIBOBJS@ |
3852 | ++LIBRT = @LIBRT@ |
3853 | + LIBS = @LIBS@ |
3854 | + LIBTOOL = @LIBTOOL@ |
3855 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3856 | +Index: mysql-5.0.77/support-files/RHEL4-SElinux/Makefile.in |
3857 | +=================================================================== |
3858 | +--- mysql-5.0.77.orig/support-files/RHEL4-SElinux/Makefile.in |
3859 | ++++ mysql-5.0.77/support-files/RHEL4-SElinux/Makefile.in |
3860 | +@@ -146,6 +146,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3861 | + LIBDL = @LIBDL@ |
3862 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3863 | + LIBOBJS = @LIBOBJS@ |
3864 | ++LIBRT = @LIBRT@ |
3865 | + LIBS = @LIBS@ |
3866 | + LIBTOOL = @LIBTOOL@ |
3867 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3868 | +Index: mysql-5.0.77/tests/Makefile.in |
3869 | +=================================================================== |
3870 | +--- mysql-5.0.77.orig/tests/Makefile.in |
3871 | ++++ mysql-5.0.77/tests/Makefile.in |
3872 | +@@ -193,6 +193,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3873 | LIBDL = @LIBDL@ |
3874 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3875 | LIBOBJS = @LIBOBJS@ |
3876 | @@ -4395,43 +4515,47 @@ |
3877 | LIBS = @CLIENT_LIBS@ |
3878 | LIBTOOL = @LIBTOOL@ |
3879 | LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3880 | -diff -r 23e5576aa59a tools/Makefile.in |
3881 | ---- a/tools/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3882 | -+++ b/tools/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3883 | -@@ -167,6 +167,7 @@ |
3884 | - LIBDL = @LIBDL@ |
3885 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3886 | - LIBOBJS = @LIBOBJS@ |
3887 | -+LIBRT = @LIBRT@ |
3888 | - LIBS = @LIBS@ |
3889 | - LIBTOOL = @LIBTOOL@ |
3890 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3891 | -diff -r 23e5576aa59a vio/Makefile.in |
3892 | ---- a/vio/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3893 | -+++ b/vio/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3894 | -@@ -176,6 +176,7 @@ |
3895 | - LIBDL = @LIBDL@ |
3896 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3897 | - LIBOBJS = @LIBOBJS@ |
3898 | -+LIBRT = @LIBRT@ |
3899 | - LIBS = @LIBS@ |
3900 | - LIBTOOL = @LIBTOOL@ |
3901 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3902 | -diff -r 23e5576aa59a win/Makefile.in |
3903 | ---- a/win/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3904 | -+++ b/win/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3905 | -@@ -144,6 +144,7 @@ |
3906 | - LIBDL = @LIBDL@ |
3907 | - LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3908 | - LIBOBJS = @LIBOBJS@ |
3909 | -+LIBRT = @LIBRT@ |
3910 | - LIBS = @LIBS@ |
3911 | - LIBTOOL = @LIBTOOL@ |
3912 | - LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3913 | -diff -r 23e5576aa59a zlib/Makefile.in |
3914 | ---- a/zlib/Makefile.in Tue Feb 17 22:33:00 2009 -0800 |
3915 | -+++ b/zlib/Makefile.in Tue Feb 17 22:33:23 2009 -0800 |
3916 | -@@ -187,6 +187,7 @@ |
3917 | +Index: mysql-5.0.77/tools/Makefile.in |
3918 | +=================================================================== |
3919 | +--- mysql-5.0.77.orig/tools/Makefile.in |
3920 | ++++ mysql-5.0.77/tools/Makefile.in |
3921 | +@@ -167,6 +167,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3922 | + LIBDL = @LIBDL@ |
3923 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3924 | + LIBOBJS = @LIBOBJS@ |
3925 | ++LIBRT = @LIBRT@ |
3926 | + LIBS = @LIBS@ |
3927 | + LIBTOOL = @LIBTOOL@ |
3928 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3929 | +Index: mysql-5.0.77/vio/Makefile.in |
3930 | +=================================================================== |
3931 | +--- mysql-5.0.77.orig/vio/Makefile.in |
3932 | ++++ mysql-5.0.77/vio/Makefile.in |
3933 | +@@ -176,6 +176,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3934 | + LIBDL = @LIBDL@ |
3935 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3936 | + LIBOBJS = @LIBOBJS@ |
3937 | ++LIBRT = @LIBRT@ |
3938 | + LIBS = @LIBS@ |
3939 | + LIBTOOL = @LIBTOOL@ |
3940 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3941 | +Index: mysql-5.0.77/win/Makefile.in |
3942 | +=================================================================== |
3943 | +--- mysql-5.0.77.orig/win/Makefile.in |
3944 | ++++ mysql-5.0.77/win/Makefile.in |
3945 | +@@ -144,6 +144,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3946 | + LIBDL = @LIBDL@ |
3947 | + LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3948 | + LIBOBJS = @LIBOBJS@ |
3949 | ++LIBRT = @LIBRT@ |
3950 | + LIBS = @LIBS@ |
3951 | + LIBTOOL = @LIBTOOL@ |
3952 | + LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ |
3953 | +Index: mysql-5.0.77/zlib/Makefile.in |
3954 | +=================================================================== |
3955 | +--- mysql-5.0.77.orig/zlib/Makefile.in |
3956 | ++++ mysql-5.0.77/zlib/Makefile.in |
3957 | +@@ -187,6 +187,7 @@ LD_VERSION_SCRIPT = @LD_VERSION_SCRIPT@ |
3958 | LIBDL = @LIBDL@ |
3959 | LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@ |
3960 | LIBOBJS = @LIBOBJS@ |
This contains a patch to userstatsv2. It changes the index size to HOSTNAME_LENGTH (60) instead of the old USERNAME_LENGTH. In addtion, the information schema USER and CLIENT columns were changed from hard-coded '16' to USERNAME_LENGTH and HOSTNAME_LENGTH respectively.