« back to all changes in this revision
Viewing changes to userstatv2.patch
- browse files at revision 54
- compare with another revision
- download diff
- download tarball
- view history from revision 54
- Committer: Vadim Tkachenko
- Date: 2009-07-30 02:52:30 UTC
- Revision ID: vadim@percona.com-20090730025230-ina4yiy1zwivyi83
fixed leak in CLIENT_STATS
- files modified:
- innodb_io_pattern.patch
added
removed
userstatv2.patch
1
diff -r 85ce661bd25c BUILD/Makefile.in
2
--- a/BUILD/Makefile.in Wed Jul 29 00:09:40 2009 -0700
3
+++ b/BUILD/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1
diff -r 592f6c3641ba BUILD/Makefile.in
2
--- a/BUILD/Makefile.in Wed Jul 29 13:33:34 2009 -0700
3
+++ b/BUILD/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4
4
@@ -146,6 +146,7 @@
5
5
LIBDL = @LIBDL@
6
6
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
9
9
LIBS = @LIBS@
10
10
LIBTOOL = @LIBTOOL@
11
11
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
12
diff -r 85ce661bd25c Docs/Makefile.in
13
--- a/Docs/Makefile.in Wed Jul 29 00:09:40 2009 -0700
14
+++ b/Docs/Makefile.in Wed Jul 29 00:09:56 2009 -0700
12
diff -r 592f6c3641ba Docs/Makefile.in
13
--- a/Docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
14
+++ b/Docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
15
15
@@ -144,6 +144,7 @@
16
16
LIBDL = @LIBDL@
17
17
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
20
20
LIBS = @LIBS@
21
21
LIBTOOL = @LIBTOOL@
22
22
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
23
diff -r 85ce661bd25c Makefile.in
24
--- a/Makefile.in Wed Jul 29 00:09:40 2009 -0700
25
+++ b/Makefile.in Wed Jul 29 00:09:56 2009 -0700
23
diff -r 592f6c3641ba Makefile.in
24
--- a/Makefile.in Wed Jul 29 13:33:34 2009 -0700
25
+++ b/Makefile.in Wed Jul 29 13:34:11 2009 -0700
26
26
@@ -171,6 +171,7 @@
27
27
LIBDL = @LIBDL@
28
28
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
31
31
LIBS = @LIBS@
32
32
LIBTOOL = @LIBTOOL@
33
33
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
34
diff -r 85ce661bd25c SSL/Makefile.in
35
--- a/SSL/Makefile.in Wed Jul 29 00:09:40 2009 -0700
36
+++ b/SSL/Makefile.in Wed Jul 29 00:09:56 2009 -0700
34
diff -r 592f6c3641ba SSL/Makefile.in
35
--- a/SSL/Makefile.in Wed Jul 29 13:33:34 2009 -0700
36
+++ b/SSL/Makefile.in Wed Jul 29 13:34:11 2009 -0700
37
37
@@ -144,6 +144,7 @@
38
38
LIBDL = @LIBDL@
39
39
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
42
42
LIBS = @LIBS@
43
43
LIBTOOL = @LIBTOOL@
44
44
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
45
diff -r 85ce661bd25c client/Makefile.in
46
--- a/client/Makefile.in Wed Jul 29 00:09:40 2009 -0700
47
+++ b/client/Makefile.in Wed Jul 29 00:09:56 2009 -0700
45
diff -r 592f6c3641ba client/Makefile.in
46
--- a/client/Makefile.in Wed Jul 29 13:33:34 2009 -0700
47
+++ b/client/Makefile.in Wed Jul 29 13:34:11 2009 -0700
48
48
@@ -247,6 +247,7 @@
49
49
LIBDL = @LIBDL@
50
50
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
53
53
LIBS = @CLIENT_LIBS@
54
54
LIBTOOL = @LIBTOOL@
55
55
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
56
diff -r 85ce661bd25c cmd-line-utils/Makefile.in
57
--- a/cmd-line-utils/Makefile.in Wed Jul 29 00:09:40 2009 -0700
58
+++ b/cmd-line-utils/Makefile.in Wed Jul 29 00:09:56 2009 -0700
56
diff -r 592f6c3641ba cmd-line-utils/Makefile.in
57
--- a/cmd-line-utils/Makefile.in Wed Jul 29 13:33:34 2009 -0700
58
+++ b/cmd-line-utils/Makefile.in Wed Jul 29 13:34:11 2009 -0700
59
59
@@ -157,6 +157,7 @@
60
60
LIBDL = @LIBDL@
61
61
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
64
64
LIBS = @LIBS@
65
65
LIBTOOL = @LIBTOOL@
66
66
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
67
diff -r 85ce661bd25c cmd-line-utils/libedit/Makefile.in
68
--- a/cmd-line-utils/libedit/Makefile.in Wed Jul 29 00:09:40 2009 -0700
69
+++ b/cmd-line-utils/libedit/Makefile.in Wed Jul 29 00:09:56 2009 -0700
67
diff -r 592f6c3641ba cmd-line-utils/libedit/Makefile.in
68
--- a/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:33:34 2009 -0700
69
+++ b/cmd-line-utils/libedit/Makefile.in Wed Jul 29 13:34:11 2009 -0700
70
70
@@ -166,6 +166,7 @@
71
71
LIBDL = @LIBDL@
72
72
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
75
75
LIBS = @LIBS@
76
76
LIBTOOL = @LIBTOOL@
77
77
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
78
diff -r 85ce661bd25c cmd-line-utils/readline/Makefile.in
79
--- a/cmd-line-utils/readline/Makefile.in Wed Jul 29 00:09:40 2009 -0700
80
+++ b/cmd-line-utils/readline/Makefile.in Wed Jul 29 00:09:56 2009 -0700
78
diff -r 592f6c3641ba cmd-line-utils/readline/Makefile.in
79
--- a/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:33:34 2009 -0700
80
+++ b/cmd-line-utils/readline/Makefile.in Wed Jul 29 13:34:11 2009 -0700
81
81
@@ -173,6 +173,7 @@
82
82
LIBDL = @LIBDL@
83
83
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
86
86
LIBS = @LIBS@
87
87
LIBTOOL = @LIBTOOL@
88
88
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
89
diff -r 85ce661bd25c configure
90
--- a/configure Wed Jul 29 00:09:40 2009 -0700
91
+++ b/configure Wed Jul 29 00:09:56 2009 -0700
89
diff -r 592f6c3641ba configure
90
--- a/configure Wed Jul 29 13:33:34 2009 -0700
91
+++ b/configure Wed Jul 29 13:34:11 2009 -0700
92
92
@@ -35347,7 +35347,91 @@
93
93
# We also disable for SCO for the time being, the headers for the
94
94
# thread library we use conflicts with other headers.
191
191
192
192
193
193
194
diff -r 85ce661bd25c configure.in
195
--- a/configure.in Wed Jul 29 00:09:40 2009 -0700
196
+++ b/configure.in Wed Jul 29 00:09:56 2009 -0700
194
diff -r 592f6c3641ba configure.in
195
--- a/configure.in Wed Jul 29 13:33:34 2009 -0700
196
+++ b/configure.in Wed Jul 29 13:34:11 2009 -0700
197
197
@@ -2136,7 +2136,18 @@
198
198
# We also disable for SCO for the time being, the headers for the
199
199
# thread library we use conflicts with other headers.
223
223
224
224
AC_SUBST(CLIENT_LIBS)
225
225
AC_SUBST(NON_THREADED_LIBS)
226
diff -r 85ce661bd25c dbug/Makefile.in
227
--- a/dbug/Makefile.in Wed Jul 29 00:09:40 2009 -0700
228
+++ b/dbug/Makefile.in Wed Jul 29 00:09:56 2009 -0700
226
diff -r 592f6c3641ba dbug/Makefile.in
227
--- a/dbug/Makefile.in Wed Jul 29 13:33:34 2009 -0700
228
+++ b/dbug/Makefile.in Wed Jul 29 13:34:11 2009 -0700
229
229
@@ -192,6 +192,7 @@
230
230
LIBDL = @LIBDL@
231
231
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
234
234
LIBS = @LIBS@
235
235
LIBTOOL = @LIBTOOL@
236
236
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
237
diff -r 85ce661bd25c extra/Makefile.in
238
--- a/extra/Makefile.in Wed Jul 29 00:09:40 2009 -0700
239
+++ b/extra/Makefile.in Wed Jul 29 00:09:56 2009 -0700
237
diff -r 592f6c3641ba extra/Makefile.in
238
--- a/extra/Makefile.in Wed Jul 29 13:33:34 2009 -0700
239
+++ b/extra/Makefile.in Wed Jul 29 13:34:11 2009 -0700
240
240
@@ -240,6 +240,7 @@
241
241
LIBDL = @LIBDL@
242
242
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
245
245
LIBS = @LIBS@
246
246
LIBTOOL = @LIBTOOL@
247
247
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
248
diff -r 85ce661bd25c extra/yassl/Makefile.in
249
--- a/extra/yassl/Makefile.in Wed Jul 29 00:09:40 2009 -0700
250
+++ b/extra/yassl/Makefile.in Wed Jul 29 00:09:56 2009 -0700
248
diff -r 592f6c3641ba extra/yassl/Makefile.in
249
--- a/extra/yassl/Makefile.in Wed Jul 29 13:33:34 2009 -0700
250
+++ b/extra/yassl/Makefile.in Wed Jul 29 13:34:11 2009 -0700
251
251
@@ -142,6 +142,7 @@
252
252
LIBDL = @LIBDL@
253
253
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
256
256
LIBS = @LIBS@
257
257
LIBTOOL = @LIBTOOL@
258
258
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
259
diff -r 85ce661bd25c extra/yassl/src/Makefile.in
260
--- a/extra/yassl/src/Makefile.in Wed Jul 29 00:09:40 2009 -0700
261
+++ b/extra/yassl/src/Makefile.in Wed Jul 29 00:09:56 2009 -0700
259
diff -r 592f6c3641ba extra/yassl/src/Makefile.in
260
--- a/extra/yassl/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
261
+++ b/extra/yassl/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
262
262
@@ -151,6 +151,7 @@
263
263
LIBDL = @LIBDL@
264
264
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
267
267
LIBS = @LIBS@
268
268
LIBTOOL = @LIBTOOL@
269
269
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
270
diff -r 85ce661bd25c extra/yassl/taocrypt/Makefile.in
271
--- a/extra/yassl/taocrypt/Makefile.in Wed Jul 29 00:09:40 2009 -0700
272
+++ b/extra/yassl/taocrypt/Makefile.in Wed Jul 29 00:09:56 2009 -0700
270
diff -r 592f6c3641ba extra/yassl/taocrypt/Makefile.in
271
--- a/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:33:34 2009 -0700
272
+++ b/extra/yassl/taocrypt/Makefile.in Wed Jul 29 13:34:11 2009 -0700
273
273
@@ -142,6 +142,7 @@
274
274
LIBDL = @LIBDL@
275
275
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
278
278
LIBS = @LIBS@
279
279
LIBTOOL = @LIBTOOL@
280
280
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
281
diff -r 85ce661bd25c extra/yassl/taocrypt/benchmark/Makefile.in
282
--- a/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 00:09:40 2009 -0700
283
+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 00:09:56 2009 -0700
281
diff -r 592f6c3641ba extra/yassl/taocrypt/benchmark/Makefile.in
282
--- a/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:33:34 2009 -0700
283
+++ b/extra/yassl/taocrypt/benchmark/Makefile.in Wed Jul 29 13:34:11 2009 -0700
284
284
@@ -153,6 +153,7 @@
285
285
LIBDL = @LIBDL@
286
286
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
289
289
LIBS = @LIBS@
290
290
LIBTOOL = @LIBTOOL@
291
291
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
292
diff -r 85ce661bd25c extra/yassl/taocrypt/src/Makefile.in
293
--- a/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 00:09:40 2009 -0700
294
+++ b/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 00:09:56 2009 -0700
292
diff -r 592f6c3641ba extra/yassl/taocrypt/src/Makefile.in
293
--- a/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
294
+++ b/extra/yassl/taocrypt/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
295
295
@@ -164,6 +164,7 @@
296
296
LIBDL = @LIBDL@
297
297
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
300
300
LIBS = @LIBS@
301
301
LIBTOOL = @LIBTOOL@
302
302
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
303
diff -r 85ce661bd25c extra/yassl/taocrypt/test/Makefile.in
304
--- a/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 00:09:40 2009 -0700
305
+++ b/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 00:09:56 2009 -0700
303
diff -r 592f6c3641ba extra/yassl/taocrypt/test/Makefile.in
304
--- a/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
305
+++ b/extra/yassl/taocrypt/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
306
306
@@ -153,6 +153,7 @@
307
307
LIBDL = @LIBDL@
308
308
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
311
311
LIBS = @LIBS@
312
312
LIBTOOL = @LIBTOOL@
313
313
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
314
diff -r 85ce661bd25c extra/yassl/testsuite/Makefile.in
315
--- a/extra/yassl/testsuite/Makefile.in Wed Jul 29 00:09:40 2009 -0700
316
+++ b/extra/yassl/testsuite/Makefile.in Wed Jul 29 00:09:56 2009 -0700
314
diff -r 592f6c3641ba extra/yassl/testsuite/Makefile.in
315
--- a/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:33:34 2009 -0700
316
+++ b/extra/yassl/testsuite/Makefile.in Wed Jul 29 13:34:11 2009 -0700
317
317
@@ -156,6 +156,7 @@
318
318
LIBDL = @LIBDL@
319
319
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
322
322
LIBS = @LIBS@
323
323
LIBTOOL = @LIBTOOL@
324
324
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
325
diff -r 85ce661bd25c heap/Makefile.in
326
--- a/heap/Makefile.in Wed Jul 29 00:09:40 2009 -0700
327
+++ b/heap/Makefile.in Wed Jul 29 00:09:56 2009 -0700
325
diff -r 592f6c3641ba heap/Makefile.in
326
--- a/heap/Makefile.in Wed Jul 29 13:33:34 2009 -0700
327
+++ b/heap/Makefile.in Wed Jul 29 13:34:11 2009 -0700
328
328
@@ -202,6 +202,7 @@
329
329
LIBDL = @LIBDL@
330
330
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
333
333
LIBS = @LIBS@
334
334
LIBTOOL = @LIBTOOL@
335
335
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
336
diff -r 85ce661bd25c include/Makefile.in
337
--- a/include/Makefile.in Wed Jul 29 00:09:40 2009 -0700
338
+++ b/include/Makefile.in Wed Jul 29 00:09:56 2009 -0700
336
diff -r 592f6c3641ba include/Makefile.in
337
--- a/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
338
+++ b/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
339
339
@@ -160,6 +160,7 @@
340
340
LIBDL = @LIBDL@
341
341
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
344
344
LIBS = @LIBS@
345
345
LIBTOOL = @LIBTOOL@
346
346
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
347
diff -r 85ce661bd25c include/mysql_com.h
348
--- a/include/mysql_com.h Wed Jul 29 00:09:40 2009 -0700
349
+++ b/include/mysql_com.h Wed Jul 29 00:09:56 2009 -0700
350
@@ -106,6 +106,10 @@
347
diff -r 592f6c3641ba include/mysql_com.h
348
--- a/include/mysql_com.h Wed Jul 29 13:33:34 2009 -0700
349
+++ b/include/mysql_com.h Wed Jul 29 13:34:11 2009 -0700
350
@@ -25,6 +25,7 @@
351
#define USERNAME_LENGTH 16
352
#define SERVER_VERSION_LENGTH 60
353
#define SQLSTATE_LENGTH 5
354
+#define LIST_PROCESS_HOST_LEN 64
355
356
/*
357
USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain
358
@@ -106,6 +107,11 @@
351
359
thread */
352
360
#define REFRESH_MASTER 128 /* Remove all bin logs in the index
353
361
and truncate the index */
355
363
+#define REFRESH_INDEX_STATS 512 /* Refresh index stats hash table */
356
364
+#define REFRESH_USER_STATS 1024 /* Refresh user stats hash table */
357
365
+#define REFRESH_SLOW_QUERY_LOG 4096 /* Flush slow query log and rotate*/
366
+#define REFRESH_CLIENT_STATS 8192 /* Refresh client stats hash table */
358
367
359
368
/* The following can't be set with mysql_refresh() */
360
369
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */
361
diff -r 85ce661bd25c libmysql/Makefile.in
362
--- a/libmysql/Makefile.in Wed Jul 29 00:09:40 2009 -0700
363
+++ b/libmysql/Makefile.in Wed Jul 29 00:09:56 2009 -0700
370
diff -r 592f6c3641ba libmysql/Makefile.in
371
--- a/libmysql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
372
+++ b/libmysql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
364
373
@@ -224,6 +224,7 @@
365
374
LIBDL = @LIBDL@
366
375
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
369
378
LIBS = @CLIENT_LIBS@
370
379
LIBTOOL = @LIBTOOL@
371
380
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
372
diff -r 85ce661bd25c libmysql_r/Makefile.in
373
--- a/libmysql_r/Makefile.in Wed Jul 29 00:09:40 2009 -0700
374
+++ b/libmysql_r/Makefile.in Wed Jul 29 00:09:56 2009 -0700
381
diff -r 592f6c3641ba libmysql_r/Makefile.in
382
--- a/libmysql_r/Makefile.in Wed Jul 29 13:33:34 2009 -0700
383
+++ b/libmysql_r/Makefile.in Wed Jul 29 13:34:11 2009 -0700
375
384
@@ -221,6 +221,7 @@
376
385
LIBDL = @LIBDL@
377
386
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
380
389
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
381
390
LIBTOOL = @LIBTOOL@
382
391
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
383
diff -r 85ce661bd25c libmysqld/Makefile.in
384
--- a/libmysqld/Makefile.in Wed Jul 29 00:09:40 2009 -0700
385
+++ b/libmysqld/Makefile.in Wed Jul 29 00:09:56 2009 -0700
392
diff -r 592f6c3641ba libmysqld/Makefile.in
393
--- a/libmysqld/Makefile.in Wed Jul 29 13:33:34 2009 -0700
394
+++ b/libmysqld/Makefile.in Wed Jul 29 13:34:11 2009 -0700
386
395
@@ -246,6 +246,7 @@
387
396
LIBDL = @LIBDL@
388
397
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
391
400
LIBS = @LIBS@
392
401
LIBTOOL = @LIBTOOL@
393
402
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
394
diff -r 85ce661bd25c libmysqld/examples/Makefile.in
395
--- a/libmysqld/examples/Makefile.in Wed Jul 29 00:09:40 2009 -0700
396
+++ b/libmysqld/examples/Makefile.in Wed Jul 29 00:09:56 2009 -0700
403
diff -r 592f6c3641ba libmysqld/examples/Makefile.in
404
--- a/libmysqld/examples/Makefile.in Wed Jul 29 13:33:34 2009 -0700
405
+++ b/libmysqld/examples/Makefile.in Wed Jul 29 13:34:11 2009 -0700
397
406
@@ -192,6 +192,7 @@
398
407
LIBDL = @LIBDL@
399
408
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
402
411
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
403
412
LIBTOOL = @LIBTOOL@
404
413
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
405
diff -r 85ce661bd25c man/Makefile.in
406
--- a/man/Makefile.in Wed Jul 29 00:09:40 2009 -0700
407
+++ b/man/Makefile.in Wed Jul 29 00:09:56 2009 -0700
414
diff -r 592f6c3641ba man/Makefile.in
415
--- a/man/Makefile.in Wed Jul 29 13:33:34 2009 -0700
416
+++ b/man/Makefile.in Wed Jul 29 13:34:11 2009 -0700
408
417
@@ -151,6 +151,7 @@
409
418
LIBDL = @LIBDL@
410
419
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
413
422
LIBS = @LIBS@
414
423
LIBTOOL = @LIBTOOL@
415
424
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
416
diff -r 85ce661bd25c myisam/Makefile.in
417
--- a/myisam/Makefile.in Wed Jul 29 00:09:40 2009 -0700
418
+++ b/myisam/Makefile.in Wed Jul 29 00:09:56 2009 -0700
425
diff -r 592f6c3641ba myisam/Makefile.in
426
--- a/myisam/Makefile.in Wed Jul 29 13:33:34 2009 -0700
427
+++ b/myisam/Makefile.in Wed Jul 29 13:34:11 2009 -0700
419
428
@@ -235,6 +235,7 @@
420
429
LIBDL = @LIBDL@
421
430
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
424
433
LIBS = @LIBS@
425
434
LIBTOOL = @LIBTOOL@
426
435
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
427
diff -r 85ce661bd25c myisammrg/Makefile.in
428
--- a/myisammrg/Makefile.in Wed Jul 29 00:09:40 2009 -0700
429
+++ b/myisammrg/Makefile.in Wed Jul 29 00:09:56 2009 -0700
436
diff -r 592f6c3641ba myisammrg/Makefile.in
437
--- a/myisammrg/Makefile.in Wed Jul 29 13:33:34 2009 -0700
438
+++ b/myisammrg/Makefile.in Wed Jul 29 13:34:11 2009 -0700
430
439
@@ -183,6 +183,7 @@
431
440
LIBDL = @LIBDL@
432
441
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
435
444
LIBS = @LIBS@
436
445
LIBTOOL = @LIBTOOL@
437
446
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
438
diff -r 85ce661bd25c mysql-test/Makefile.in
439
--- a/mysql-test/Makefile.in Wed Jul 29 00:09:40 2009 -0700
440
+++ b/mysql-test/Makefile.in Wed Jul 29 00:09:56 2009 -0700
447
diff -r 592f6c3641ba mysql-test/Makefile.in
448
--- a/mysql-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
449
+++ b/mysql-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
441
450
@@ -161,6 +161,7 @@
442
451
LIBDL = @LIBDL@
443
452
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
446
455
LIBS = @LIBS@
447
456
LIBTOOL = @LIBTOOL@
448
457
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
449
diff -r 85ce661bd25c mysql-test/ndb/Makefile.in
450
--- a/mysql-test/ndb/Makefile.in Wed Jul 29 00:09:40 2009 -0700
451
+++ b/mysql-test/ndb/Makefile.in Wed Jul 29 00:09:56 2009 -0700
458
diff -r 592f6c3641ba mysql-test/ndb/Makefile.in
459
--- a/mysql-test/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
460
+++ b/mysql-test/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
452
461
@@ -147,6 +147,7 @@
453
462
LIBDL = @LIBDL@
454
463
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
457
466
LIBS = @LIBS@
458
467
LIBTOOL = @LIBTOOL@
459
468
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
460
diff -r 85ce661bd25c mysql-test/r/information_schema.result
461
--- a/mysql-test/r/information_schema.result Wed Jul 29 00:09:40 2009 -0700
462
+++ b/mysql-test/r/information_schema.result Wed Jul 29 00:09:56 2009 -0700
469
diff -r 592f6c3641ba mysql-test/r/information_schema.result
470
--- a/mysql-test/r/information_schema.result Wed Jul 29 13:33:34 2009 -0700
471
+++ b/mysql-test/r/information_schema.result Wed Jul 29 13:34:11 2009 -0700
463
472
@@ -37,10 +37,12 @@
464
473
select * from v1;
465
474
c
642
651
VIEWS information_schema.VIEWS 1
643
652
create table t1(f1 int);
644
653
create view v1 as select f1+1 as a from t1;
645
diff -r 85ce661bd25c mysql-test/r/information_schema_db.result
646
--- a/mysql-test/r/information_schema_db.result Wed Jul 29 00:09:40 2009 -0700
647
+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 00:09:56 2009 -0700
654
diff -r 592f6c3641ba mysql-test/r/information_schema_db.result
655
--- a/mysql-test/r/information_schema_db.result Wed Jul 29 13:33:34 2009 -0700
656
+++ b/mysql-test/r/information_schema_db.result Wed Jul 29 13:34:11 2009 -0700
648
657
@@ -6,10 +6,12 @@
649
658
show tables;
650
659
Tables_in_information_schema
676
685
TRIGGERS
677
686
create database `inf%`;
678
687
create database mbase;
679
diff -r 85ce661bd25c mysql-test/r/mysqlshow.result
680
--- a/mysql-test/r/mysqlshow.result Wed Jul 29 00:09:40 2009 -0700
681
+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 00:09:56 2009 -0700
688
diff -r 592f6c3641ba mysql-test/r/mysqlshow.result
689
--- a/mysql-test/r/mysqlshow.result Wed Jul 29 13:33:34 2009 -0700
690
+++ b/mysql-test/r/mysqlshow.result Wed Jul 29 13:34:11 2009 -0700
682
691
@@ -80,10 +80,12 @@
683
692
| Tables |
684
693
+---------------------------------------+
727
736
| VIEWS |
728
737
+---------------------------------------+
729
738
Wildcard: inf_rmation_schema
730
diff -r 85ce661bd25c mysys/Makefile.in
731
--- a/mysys/Makefile.in Wed Jul 29 00:09:40 2009 -0700
732
+++ b/mysys/Makefile.in Wed Jul 29 00:09:56 2009 -0700
739
diff -r 592f6c3641ba mysys/Makefile.in
740
--- a/mysys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
741
+++ b/mysys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
733
742
@@ -228,6 +228,7 @@
734
743
LIBDL = @LIBDL@
735
744
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
738
747
LIBS = @LIBS@
739
748
LIBTOOL = @LIBTOOL@
740
749
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
741
diff -r 85ce661bd25c ndb/Makefile.in
742
--- a/ndb/Makefile.in Wed Jul 29 00:09:40 2009 -0700
743
+++ b/ndb/Makefile.in Wed Jul 29 00:09:56 2009 -0700
750
diff -r 592f6c3641ba ndb/Makefile.in
751
--- a/ndb/Makefile.in Wed Jul 29 13:33:34 2009 -0700
752
+++ b/ndb/Makefile.in Wed Jul 29 13:34:11 2009 -0700
744
753
@@ -171,6 +171,7 @@
745
754
LIBDL = @LIBDL@
746
755
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
749
758
LIBS = @LIBS@
750
759
LIBTOOL = @LIBTOOL@
751
760
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
752
diff -r 85ce661bd25c ndb/docs/Makefile.in
753
--- a/ndb/docs/Makefile.in Wed Jul 29 00:09:40 2009 -0700
754
+++ b/ndb/docs/Makefile.in Wed Jul 29 00:09:56 2009 -0700
761
diff -r 592f6c3641ba ndb/docs/Makefile.in
762
--- a/ndb/docs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
763
+++ b/ndb/docs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
755
764
@@ -149,6 +149,7 @@
756
765
LIBDL = @LIBDL@
757
766
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
760
769
LIBS = @LIBS@
761
770
LIBTOOL = @LIBTOOL@
762
771
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
763
diff -r 85ce661bd25c ndb/include/Makefile.in
764
--- a/ndb/include/Makefile.in Wed Jul 29 00:09:40 2009 -0700
765
+++ b/ndb/include/Makefile.in Wed Jul 29 00:09:56 2009 -0700
772
diff -r 592f6c3641ba ndb/include/Makefile.in
773
--- a/ndb/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
774
+++ b/ndb/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
766
775
@@ -179,6 +179,7 @@
767
776
LIBDL = @LIBDL@
768
777
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
771
780
LIBS = @LIBS@
772
781
LIBTOOL = @LIBTOOL@
773
782
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
774
diff -r 85ce661bd25c ndb/src/Makefile.in
775
--- a/ndb/src/Makefile.in Wed Jul 29 00:09:40 2009 -0700
776
+++ b/ndb/src/Makefile.in Wed Jul 29 00:09:56 2009 -0700
783
diff -r 592f6c3641ba ndb/src/Makefile.in
784
--- a/ndb/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
785
+++ b/ndb/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
777
786
@@ -204,6 +204,7 @@
778
787
LIBDL = @LIBDL@
779
788
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
782
791
LIBS = @LIBS@
783
792
LIBTOOL = @LIBTOOL@
784
793
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
785
diff -r 85ce661bd25c ndb/src/common/Makefile.in
786
--- a/ndb/src/common/Makefile.in Wed Jul 29 00:09:40 2009 -0700
787
+++ b/ndb/src/common/Makefile.in Wed Jul 29 00:09:56 2009 -0700
794
diff -r 592f6c3641ba ndb/src/common/Makefile.in
795
--- a/ndb/src/common/Makefile.in Wed Jul 29 13:33:34 2009 -0700
796
+++ b/ndb/src/common/Makefile.in Wed Jul 29 13:34:11 2009 -0700
788
797
@@ -174,6 +174,7 @@
789
798
LIBDL = @LIBDL@
790
799
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
793
802
LIBS = @LIBS@
794
803
LIBTOOL = @LIBTOOL@
795
804
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
796
diff -r 85ce661bd25c ndb/src/common/debugger/Makefile.in
797
--- a/ndb/src/common/debugger/Makefile.in Wed Jul 29 00:09:40 2009 -0700
798
+++ b/ndb/src/common/debugger/Makefile.in Wed Jul 29 00:09:56 2009 -0700
805
diff -r 592f6c3641ba ndb/src/common/debugger/Makefile.in
806
--- a/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
807
+++ b/ndb/src/common/debugger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
799
808
@@ -206,6 +206,7 @@
800
809
LIBDL = @LIBDL@
801
810
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
804
813
LIBS = @LIBS@
805
814
LIBTOOL = @LIBTOOL@
806
815
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
807
diff -r 85ce661bd25c ndb/src/common/debugger/signaldata/Makefile.in
808
--- a/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 00:09:40 2009 -0700
809
+++ b/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 00:09:56 2009 -0700
816
diff -r 592f6c3641ba ndb/src/common/debugger/signaldata/Makefile.in
817
--- a/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:33:34 2009 -0700
818
+++ b/ndb/src/common/debugger/signaldata/Makefile.in Wed Jul 29 13:34:11 2009 -0700
810
819
@@ -211,6 +211,7 @@
811
820
LIBDL = @LIBDL@
812
821
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
815
824
LIBS = @LIBS@
816
825
LIBTOOL = @LIBTOOL@
817
826
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
818
diff -r 85ce661bd25c ndb/src/common/logger/Makefile.in
819
--- a/ndb/src/common/logger/Makefile.in Wed Jul 29 00:09:40 2009 -0700
820
+++ b/ndb/src/common/logger/Makefile.in Wed Jul 29 00:09:56 2009 -0700
827
diff -r 592f6c3641ba ndb/src/common/logger/Makefile.in
828
--- a/ndb/src/common/logger/Makefile.in Wed Jul 29 13:33:34 2009 -0700
829
+++ b/ndb/src/common/logger/Makefile.in Wed Jul 29 13:34:11 2009 -0700
821
830
@@ -197,6 +197,7 @@
822
831
LIBDL = @LIBDL@
823
832
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
826
835
LIBS = @LIBS@
827
836
LIBTOOL = @LIBTOOL@
828
837
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
829
diff -r 85ce661bd25c ndb/src/common/mgmcommon/Makefile.in
830
--- a/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 00:09:40 2009 -0700
831
+++ b/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 00:09:56 2009 -0700
838
diff -r 592f6c3641ba ndb/src/common/mgmcommon/Makefile.in
839
--- a/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:33:34 2009 -0700
840
+++ b/ndb/src/common/mgmcommon/Makefile.in Wed Jul 29 13:34:11 2009 -0700
832
841
@@ -211,6 +211,7 @@
833
842
LIBDL = @LIBDL@
834
843
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
837
846
LIBS = @LIBS@
838
847
LIBTOOL = @LIBTOOL@
839
848
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
840
diff -r 85ce661bd25c ndb/src/common/portlib/Makefile.in
841
--- a/ndb/src/common/portlib/Makefile.in Wed Jul 29 00:09:40 2009 -0700
842
+++ b/ndb/src/common/portlib/Makefile.in Wed Jul 29 00:09:56 2009 -0700
849
diff -r 592f6c3641ba ndb/src/common/portlib/Makefile.in
850
--- a/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
851
+++ b/ndb/src/common/portlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
843
852
@@ -222,6 +222,7 @@
844
853
LIBDL = @LIBDL@
845
854
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
848
857
LIBS = @LIBS@
849
858
LIBTOOL = @LIBTOOL@
850
859
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
851
diff -r 85ce661bd25c ndb/src/common/transporter/Makefile.in
852
--- a/ndb/src/common/transporter/Makefile.in Wed Jul 29 00:09:40 2009 -0700
853
+++ b/ndb/src/common/transporter/Makefile.in Wed Jul 29 00:09:56 2009 -0700
860
diff -r 592f6c3641ba ndb/src/common/transporter/Makefile.in
861
--- a/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:33:34 2009 -0700
862
+++ b/ndb/src/common/transporter/Makefile.in Wed Jul 29 13:34:11 2009 -0700
854
863
@@ -197,6 +197,7 @@
855
864
LIBDL = @LIBDL@
856
865
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
859
868
LIBS = @LIBS@
860
869
LIBTOOL = @LIBTOOL@
861
870
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
862
diff -r 85ce661bd25c ndb/src/common/util/Makefile.in
863
--- a/ndb/src/common/util/Makefile.in Wed Jul 29 00:09:40 2009 -0700
864
+++ b/ndb/src/common/util/Makefile.in Wed Jul 29 00:09:56 2009 -0700
871
diff -r 592f6c3641ba ndb/src/common/util/Makefile.in
872
--- a/ndb/src/common/util/Makefile.in Wed Jul 29 13:33:34 2009 -0700
873
+++ b/ndb/src/common/util/Makefile.in Wed Jul 29 13:34:11 2009 -0700
865
874
@@ -217,6 +217,7 @@
866
875
LIBDL = @LIBDL@
867
876
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
870
879
LIBS = @LIBS@
871
880
LIBTOOL = @LIBTOOL@
872
881
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
873
diff -r 85ce661bd25c ndb/src/cw/Makefile.in
874
--- a/ndb/src/cw/Makefile.in Wed Jul 29 00:09:40 2009 -0700
875
+++ b/ndb/src/cw/Makefile.in Wed Jul 29 00:09:56 2009 -0700
882
diff -r 592f6c3641ba ndb/src/cw/Makefile.in
883
--- a/ndb/src/cw/Makefile.in Wed Jul 29 13:33:34 2009 -0700
884
+++ b/ndb/src/cw/Makefile.in Wed Jul 29 13:34:11 2009 -0700
876
885
@@ -156,6 +156,7 @@
877
886
LIBDL = @LIBDL@
878
887
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
881
890
LIBS = @LIBS@
882
891
LIBTOOL = @LIBTOOL@
883
892
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
884
diff -r 85ce661bd25c ndb/src/cw/cpcd/Makefile.in
885
--- a/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 00:09:40 2009 -0700
886
+++ b/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 00:09:56 2009 -0700
893
diff -r 592f6c3641ba ndb/src/cw/cpcd/Makefile.in
894
--- a/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:33:34 2009 -0700
895
+++ b/ndb/src/cw/cpcd/Makefile.in Wed Jul 29 13:34:11 2009 -0700
887
896
@@ -207,6 +207,7 @@
888
897
LIBDL = @LIBDL@
889
898
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
892
901
LIBS = @LIBS@
893
902
LIBTOOL = @LIBTOOL@
894
903
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
895
diff -r 85ce661bd25c ndb/src/kernel/Makefile.in
896
--- a/ndb/src/kernel/Makefile.in Wed Jul 29 00:09:40 2009 -0700
897
+++ b/ndb/src/kernel/Makefile.in Wed Jul 29 00:09:56 2009 -0700
904
diff -r 592f6c3641ba ndb/src/kernel/Makefile.in
905
--- a/ndb/src/kernel/Makefile.in Wed Jul 29 13:33:34 2009 -0700
906
+++ b/ndb/src/kernel/Makefile.in Wed Jul 29 13:34:11 2009 -0700
898
907
@@ -227,6 +227,7 @@
899
908
LIBDL = @LIBDL@
900
909
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
903
912
LIBS = @LIBS@
904
913
LIBTOOL = @LIBTOOL@
905
914
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
906
diff -r 85ce661bd25c ndb/src/kernel/blocks/Makefile.in
907
--- a/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 00:09:40 2009 -0700
908
+++ b/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 00:09:56 2009 -0700
915
diff -r 592f6c3641ba ndb/src/kernel/blocks/Makefile.in
916
--- a/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:33:34 2009 -0700
917
+++ b/ndb/src/kernel/blocks/Makefile.in Wed Jul 29 13:34:11 2009 -0700
909
918
@@ -156,6 +156,7 @@
910
919
LIBDL = @LIBDL@
911
920
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
914
923
LIBS = @LIBS@
915
924
LIBTOOL = @LIBTOOL@
916
925
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
917
diff -r 85ce661bd25c ndb/src/kernel/blocks/backup/Makefile.in
918
--- a/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 00:09:40 2009 -0700
919
+++ b/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 00:09:56 2009 -0700
920
@@ -196,6 +196,7 @@
921
LIBDL = @LIBDL@
922
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
923
LIBOBJS = @LIBOBJS@
924
+LIBRT = @LIBRT@
925
LIBS = @LIBS@
926
LIBTOOL = @LIBTOOL@
927
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
928
diff -r 85ce661bd25c ndb/src/kernel/blocks/cmvmi/Makefile.in
929
--- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 00:09:40 2009 -0700
930
+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 00:09:56 2009 -0700
931
@@ -196,6 +196,7 @@
932
LIBDL = @LIBDL@
933
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
934
LIBOBJS = @LIBOBJS@
935
+LIBRT = @LIBRT@
936
LIBS = @LIBS@
937
LIBTOOL = @LIBTOOL@
938
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
939
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbacc/Makefile.in
940
--- a/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 00:09:40 2009 -0700
941
+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 00:09:56 2009 -0700
942
@@ -196,6 +196,7 @@
943
LIBDL = @LIBDL@
944
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
945
LIBOBJS = @LIBOBJS@
946
+LIBRT = @LIBRT@
947
LIBS = @LIBS@
948
LIBTOOL = @LIBTOOL@
949
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
950
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbdict/Makefile.in
951
--- a/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 00:09:40 2009 -0700
952
+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 00:09:56 2009 -0700
926
diff -r 592f6c3641ba ndb/src/kernel/blocks/backup/Makefile.in
927
--- a/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
928
+++ b/ndb/src/kernel/blocks/backup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
929
@@ -196,6 +196,7 @@
930
LIBDL = @LIBDL@
931
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
932
LIBOBJS = @LIBOBJS@
933
+LIBRT = @LIBRT@
934
LIBS = @LIBS@
935
LIBTOOL = @LIBTOOL@
936
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
937
diff -r 592f6c3641ba ndb/src/kernel/blocks/cmvmi/Makefile.in
938
--- a/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
939
+++ b/ndb/src/kernel/blocks/cmvmi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
940
@@ -196,6 +196,7 @@
941
LIBDL = @LIBDL@
942
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
943
LIBOBJS = @LIBOBJS@
944
+LIBRT = @LIBRT@
945
LIBS = @LIBS@
946
LIBTOOL = @LIBTOOL@
947
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
948
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbacc/Makefile.in
949
--- a/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
950
+++ b/ndb/src/kernel/blocks/dbacc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
951
@@ -196,6 +196,7 @@
952
LIBDL = @LIBDL@
953
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
954
LIBOBJS = @LIBOBJS@
955
+LIBRT = @LIBRT@
956
LIBS = @LIBS@
957
LIBTOOL = @LIBTOOL@
958
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
959
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdict/Makefile.in
960
--- a/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:33:34 2009 -0700
961
+++ b/ndb/src/kernel/blocks/dbdict/Makefile.in Wed Jul 29 13:34:11 2009 -0700
953
962
@@ -206,6 +206,7 @@
954
963
LIBDL = @LIBDL@
955
964
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
958
967
LIBS = @LIBS@
959
968
LIBTOOL = @LIBTOOL@
960
969
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
961
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbdih/Makefile.in
962
--- a/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 00:09:40 2009 -0700
963
+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 00:09:56 2009 -0700
970
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbdih/Makefile.in
971
--- a/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:33:34 2009 -0700
972
+++ b/ndb/src/kernel/blocks/dbdih/Makefile.in Wed Jul 29 13:34:11 2009 -0700
964
973
@@ -203,6 +203,7 @@
965
974
LIBDL = @LIBDL@
966
975
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
969
978
LIBS = @LIBS@
970
979
LIBTOOL = @LIBTOOL@
971
980
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
972
diff -r 85ce661bd25c ndb/src/kernel/blocks/dblqh/Makefile.in
973
--- a/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 00:09:40 2009 -0700
974
+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 00:09:56 2009 -0700
981
diff -r 592f6c3641ba ndb/src/kernel/blocks/dblqh/Makefile.in
982
--- a/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:33:34 2009 -0700
983
+++ b/ndb/src/kernel/blocks/dblqh/Makefile.in Wed Jul 29 13:34:11 2009 -0700
975
984
@@ -204,6 +204,7 @@
976
985
LIBDL = @LIBDL@
977
986
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
980
989
LIBS = @LIBS@
981
990
LIBTOOL = @LIBTOOL@
982
991
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
983
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbtc/Makefile.in
984
--- a/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 00:09:40 2009 -0700
985
+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 00:09:56 2009 -0700
992
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtc/Makefile.in
993
--- a/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:33:34 2009 -0700
994
+++ b/ndb/src/kernel/blocks/dbtc/Makefile.in Wed Jul 29 13:34:11 2009 -0700
986
995
@@ -196,6 +196,7 @@
987
996
LIBDL = @LIBDL@
988
997
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
991
1000
LIBS = @LIBS@
992
1001
LIBTOOL = @LIBTOOL@
993
1002
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
994
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbtup/Makefile.in
995
--- a/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 00:09:40 2009 -0700
996
+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1003
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtup/Makefile.in
1004
--- a/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1005
+++ b/ndb/src/kernel/blocks/dbtup/Makefile.in Wed Jul 29 13:34:11 2009 -0700
997
1006
@@ -204,6 +204,7 @@
998
1007
LIBDL = @LIBDL@
999
1008
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1002
1011
LIBS = @LIBS@
1003
1012
LIBTOOL = @LIBTOOL@
1004
1013
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1005
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbtux/Makefile.in
1006
--- a/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1007
+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1014
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbtux/Makefile.in
1015
--- a/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1016
+++ b/ndb/src/kernel/blocks/dbtux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1008
1017
@@ -199,6 +199,7 @@
1009
1018
LIBDL = @LIBDL@
1010
1019
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1013
1022
LIBS = @LIBS@
1014
1023
LIBTOOL = @LIBTOOL@
1015
1024
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1016
diff -r 85ce661bd25c ndb/src/kernel/blocks/dbutil/Makefile.in
1017
--- a/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1018
+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1019
@@ -196,6 +196,7 @@
1020
LIBDL = @LIBDL@
1021
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1022
LIBOBJS = @LIBOBJS@
1023
+LIBRT = @LIBRT@
1024
LIBS = @LIBS@
1025
LIBTOOL = @LIBTOOL@
1026
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1027
diff -r 85ce661bd25c ndb/src/kernel/blocks/ndbcntr/Makefile.in
1028
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1029
+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1030
@@ -197,6 +197,7 @@
1031
LIBDL = @LIBDL@
1032
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1033
LIBOBJS = @LIBOBJS@
1034
+LIBRT = @LIBRT@
1035
LIBS = @LIBS@
1036
LIBTOOL = @LIBTOOL@
1037
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1038
diff -r 85ce661bd25c ndb/src/kernel/blocks/ndbfs/Makefile.in
1039
--- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1040
+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1041
@@ -197,6 +197,7 @@
1042
LIBDL = @LIBDL@
1043
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1044
LIBOBJS = @LIBOBJS@
1045
+LIBRT = @LIBRT@
1046
LIBS = @LIBS@
1047
LIBTOOL = @LIBTOOL@
1048
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1049
diff -r 85ce661bd25c ndb/src/kernel/blocks/qmgr/Makefile.in
1050
--- a/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1051
+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1052
@@ -196,6 +196,7 @@
1053
LIBDL = @LIBDL@
1054
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1055
LIBOBJS = @LIBOBJS@
1056
+LIBRT = @LIBRT@
1057
LIBS = @LIBS@
1058
LIBTOOL = @LIBTOOL@
1059
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1060
diff -r 85ce661bd25c ndb/src/kernel/blocks/suma/Makefile.in
1061
--- a/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1062
+++ b/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1063
@@ -196,6 +196,7 @@
1064
LIBDL = @LIBDL@
1065
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1066
LIBOBJS = @LIBOBJS@
1067
+LIBRT = @LIBRT@
1068
LIBS = @LIBS@
1069
LIBTOOL = @LIBTOOL@
1070
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1071
diff -r 85ce661bd25c ndb/src/kernel/blocks/trix/Makefile.in
1072
--- a/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1073
+++ b/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1074
@@ -196,6 +196,7 @@
1075
LIBDL = @LIBDL@
1076
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1077
LIBOBJS = @LIBOBJS@
1078
+LIBRT = @LIBRT@
1079
LIBS = @LIBS@
1080
LIBTOOL = @LIBTOOL@
1081
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1082
diff -r 85ce661bd25c ndb/src/kernel/error/Makefile.in
1083
--- a/ndb/src/kernel/error/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1084
+++ b/ndb/src/kernel/error/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1025
diff -r 592f6c3641ba ndb/src/kernel/blocks/dbutil/Makefile.in
1026
--- a/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1027
+++ b/ndb/src/kernel/blocks/dbutil/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1028
@@ -196,6 +196,7 @@
1029
LIBDL = @LIBDL@
1030
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1031
LIBOBJS = @LIBOBJS@
1032
+LIBRT = @LIBRT@
1033
LIBS = @LIBS@
1034
LIBTOOL = @LIBTOOL@
1035
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1036
diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbcntr/Makefile.in
1037
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1038
+++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1039
@@ -197,6 +197,7 @@
1040
LIBDL = @LIBDL@
1041
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1042
LIBOBJS = @LIBOBJS@
1043
+LIBRT = @LIBRT@
1044
LIBS = @LIBS@
1045
LIBTOOL = @LIBTOOL@
1046
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1047
diff -r 592f6c3641ba ndb/src/kernel/blocks/ndbfs/Makefile.in
1048
--- a/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1049
+++ b/ndb/src/kernel/blocks/ndbfs/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1050
@@ -197,6 +197,7 @@
1051
LIBDL = @LIBDL@
1052
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1053
LIBOBJS = @LIBOBJS@
1054
+LIBRT = @LIBRT@
1055
LIBS = @LIBS@
1056
LIBTOOL = @LIBTOOL@
1057
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1058
diff -r 592f6c3641ba ndb/src/kernel/blocks/qmgr/Makefile.in
1059
--- a/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1060
+++ b/ndb/src/kernel/blocks/qmgr/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1061
@@ -196,6 +196,7 @@
1062
LIBDL = @LIBDL@
1063
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1064
LIBOBJS = @LIBOBJS@
1065
+LIBRT = @LIBRT@
1066
LIBS = @LIBS@
1067
LIBTOOL = @LIBTOOL@
1068
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1069
diff -r 592f6c3641ba ndb/src/kernel/blocks/suma/Makefile.in
1070
--- a/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1071
+++ b/ndb/src/kernel/blocks/suma/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1072
@@ -196,6 +196,7 @@
1073
LIBDL = @LIBDL@
1074
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1075
LIBOBJS = @LIBOBJS@
1076
+LIBRT = @LIBRT@
1077
LIBS = @LIBS@
1078
LIBTOOL = @LIBTOOL@
1079
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1080
diff -r 592f6c3641ba ndb/src/kernel/blocks/trix/Makefile.in
1081
--- a/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1082
+++ b/ndb/src/kernel/blocks/trix/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1083
@@ -196,6 +196,7 @@
1084
LIBDL = @LIBDL@
1085
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1086
LIBOBJS = @LIBOBJS@
1087
+LIBRT = @LIBRT@
1088
LIBS = @LIBS@
1089
LIBTOOL = @LIBTOOL@
1090
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1091
diff -r 592f6c3641ba ndb/src/kernel/error/Makefile.in
1092
--- a/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1093
+++ b/ndb/src/kernel/error/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1085
1094
@@ -206,6 +206,7 @@
1086
1095
LIBDL = @LIBDL@
1087
1096
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1090
1099
LIBS = @LIBS@
1091
1100
LIBTOOL = @LIBTOOL@
1092
1101
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1093
diff -r 85ce661bd25c ndb/src/kernel/vm/Makefile.in
1094
--- a/ndb/src/kernel/vm/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1095
+++ b/ndb/src/kernel/vm/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1102
diff -r 592f6c3641ba ndb/src/kernel/vm/Makefile.in
1103
--- a/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1104
+++ b/ndb/src/kernel/vm/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1096
1105
@@ -207,6 +207,7 @@
1097
1106
LIBDL = @LIBDL@
1098
1107
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1101
1110
LIBS = @LIBS@
1102
1111
LIBTOOL = @LIBTOOL@
1103
1112
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1104
diff -r 85ce661bd25c ndb/src/mgmapi/Makefile.in
1105
--- a/ndb/src/mgmapi/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1106
+++ b/ndb/src/mgmapi/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1113
diff -r 592f6c3641ba ndb/src/mgmapi/Makefile.in
1114
--- a/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1115
+++ b/ndb/src/mgmapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1107
1116
@@ -205,6 +205,7 @@
1108
1117
LIBDL = @LIBDL@
1109
1118
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1112
1121
LIBS = @LIBS@
1113
1122
LIBTOOL = @LIBTOOL@
1114
1123
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1115
diff -r 85ce661bd25c ndb/src/mgmclient/Makefile.in
1116
--- a/ndb/src/mgmclient/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1117
+++ b/ndb/src/mgmclient/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1124
diff -r 592f6c3641ba ndb/src/mgmclient/Makefile.in
1125
--- a/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1126
+++ b/ndb/src/mgmclient/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1118
1127
@@ -216,6 +216,7 @@
1119
1128
LIBDL = @LIBDL@
1120
1129
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1123
1132
LIBS = @LIBS@
1124
1133
LIBTOOL = @LIBTOOL@
1125
1134
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1126
diff -r 85ce661bd25c ndb/src/mgmsrv/Makefile.in
1127
--- a/ndb/src/mgmsrv/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1128
+++ b/ndb/src/mgmsrv/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1135
diff -r 592f6c3641ba ndb/src/mgmsrv/Makefile.in
1136
--- a/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1137
+++ b/ndb/src/mgmsrv/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1129
1138
@@ -213,6 +213,7 @@
1130
1139
LIBDL = @LIBDL@
1131
1140
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1134
1143
LIBS = @LIBS@
1135
1144
LIBTOOL = @LIBTOOL@
1136
1145
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1137
diff -r 85ce661bd25c ndb/src/ndbapi/Makefile.in
1138
--- a/ndb/src/ndbapi/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1139
+++ b/ndb/src/ndbapi/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1146
diff -r 592f6c3641ba ndb/src/ndbapi/Makefile.in
1147
--- a/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1148
+++ b/ndb/src/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1140
1149
@@ -215,6 +215,7 @@
1141
1150
LIBDL = @LIBDL@
1142
1151
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1145
1154
LIBS = @LIBS@
1146
1155
LIBTOOL = @LIBTOOL@
1147
1156
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1148
diff -r 85ce661bd25c ndb/test/Makefile.in
1149
--- a/ndb/test/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1150
+++ b/ndb/test/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1157
diff -r 592f6c3641ba ndb/test/Makefile.in
1158
--- a/ndb/test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1159
+++ b/ndb/test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1151
1160
@@ -156,6 +156,7 @@
1152
1161
LIBDL = @LIBDL@
1153
1162
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1156
1165
LIBS = @LIBS@
1157
1166
LIBTOOL = @LIBTOOL@
1158
1167
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1159
diff -r 85ce661bd25c ndb/test/ndbapi/Makefile.in
1160
--- a/ndb/test/ndbapi/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1161
+++ b/ndb/test/ndbapi/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1168
diff -r 592f6c3641ba ndb/test/ndbapi/Makefile.in
1169
--- a/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1170
+++ b/ndb/test/ndbapi/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1162
1171
@@ -595,6 +595,7 @@
1163
1172
LIBDL = @LIBDL@
1164
1173
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1167
1176
LIBS = @LIBS@
1168
1177
LIBTOOL = @LIBTOOL@
1169
1178
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1170
diff -r 85ce661bd25c ndb/test/ndbapi/bank/Makefile.in
1171
--- a/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1172
+++ b/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1179
diff -r 592f6c3641ba ndb/test/ndbapi/bank/Makefile.in
1180
--- a/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1181
+++ b/ndb/test/ndbapi/bank/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1173
1182
@@ -282,6 +282,7 @@
1174
1183
LIBDL = @LIBDL@
1175
1184
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1178
1187
LIBS = @LIBS@
1179
1188
LIBTOOL = @LIBTOOL@
1180
1189
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1181
diff -r 85ce661bd25c ndb/test/run-test/Makefile.in
1182
--- a/ndb/test/run-test/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1183
+++ b/ndb/test/run-test/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1190
diff -r 592f6c3641ba ndb/test/run-test/Makefile.in
1191
--- a/ndb/test/run-test/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1192
+++ b/ndb/test/run-test/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1184
1193
@@ -243,6 +243,7 @@
1185
1194
LIBDL = @LIBDL@
1186
1195
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1189
1198
LIBS = @LIBS@
1190
1199
LIBTOOL = @LIBTOOL@
1191
1200
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1192
diff -r 85ce661bd25c ndb/test/src/Makefile.in
1193
--- a/ndb/test/src/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1194
+++ b/ndb/test/src/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1201
diff -r 592f6c3641ba ndb/test/src/Makefile.in
1202
--- a/ndb/test/src/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1203
+++ b/ndb/test/src/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1195
1204
@@ -213,6 +213,7 @@
1196
1205
LIBDL = @LIBDL@
1197
1206
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1200
1209
LIBS = @LIBS@
1201
1210
LIBTOOL = @LIBTOOL@
1202
1211
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1203
diff -r 85ce661bd25c ndb/test/tools/Makefile.in
1204
--- a/ndb/test/tools/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1205
+++ b/ndb/test/tools/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1212
diff -r 592f6c3641ba ndb/test/tools/Makefile.in
1213
--- a/ndb/test/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1214
+++ b/ndb/test/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1206
1215
@@ -325,6 +325,7 @@
1207
1216
LIBDL = @LIBDL@
1208
1217
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1211
1220
LIBS = @LIBS@
1212
1221
LIBTOOL = @LIBTOOL@
1213
1222
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1214
diff -r 85ce661bd25c ndb/tools/Makefile.in
1215
--- a/ndb/tools/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1216
+++ b/ndb/tools/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1223
diff -r 592f6c3641ba ndb/tools/Makefile.in
1224
--- a/ndb/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1225
+++ b/ndb/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1217
1226
@@ -344,6 +344,7 @@
1218
1227
LIBDL = @LIBDL@
1219
1228
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1222
1231
LIBS = @LIBS@
1223
1232
LIBTOOL = @LIBTOOL@
1224
1233
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1225
diff -r 85ce661bd25c netware/Makefile.in
1226
--- a/netware/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1227
+++ b/netware/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1234
diff -r 592f6c3641ba netware/Makefile.in
1235
--- a/netware/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1236
+++ b/netware/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1228
1237
@@ -199,6 +199,7 @@
1229
1238
LIBDL = @LIBDL@
1230
1239
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1233
1242
LIBS = @LIBS@
1234
1243
LIBTOOL = @LIBTOOL@
1235
1244
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1236
diff -r 85ce661bd25c os2/Makefile.in
1237
--- a/os2/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1238
+++ b/os2/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1239
@@ -156,6 +156,7 @@
1240
LIBDL = @LIBDL@
1241
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1242
LIBOBJS = @LIBOBJS@
1243
+LIBRT = @LIBRT@
1244
LIBS = @LIBS@
1245
LIBTOOL = @LIBTOOL@
1246
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1247
diff -r 85ce661bd25c os2/include/Makefile.in
1248
--- a/os2/include/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1249
+++ b/os2/include/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1250
@@ -156,6 +156,7 @@
1251
LIBDL = @LIBDL@
1252
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1253
LIBOBJS = @LIBOBJS@
1254
+LIBRT = @LIBRT@
1255
LIBS = @LIBS@
1256
LIBTOOL = @LIBTOOL@
1257
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1258
diff -r 85ce661bd25c os2/include/sys/Makefile.in
1259
--- a/os2/include/sys/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1260
+++ b/os2/include/sys/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1245
diff -r 592f6c3641ba os2/Makefile.in
1246
--- a/os2/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1247
+++ b/os2/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1248
@@ -156,6 +156,7 @@
1249
LIBDL = @LIBDL@
1250
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1251
LIBOBJS = @LIBOBJS@
1252
+LIBRT = @LIBRT@
1253
LIBS = @LIBS@
1254
LIBTOOL = @LIBTOOL@
1255
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1256
diff -r 592f6c3641ba os2/include/Makefile.in
1257
--- a/os2/include/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1258
+++ b/os2/include/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1259
@@ -156,6 +156,7 @@
1260
LIBDL = @LIBDL@
1261
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1262
LIBOBJS = @LIBOBJS@
1263
+LIBRT = @LIBRT@
1264
LIBS = @LIBS@
1265
LIBTOOL = @LIBTOOL@
1266
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1267
diff -r 592f6c3641ba os2/include/sys/Makefile.in
1268
--- a/os2/include/sys/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1269
+++ b/os2/include/sys/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1261
1270
@@ -144,6 +144,7 @@
1262
1271
LIBDL = @LIBDL@
1263
1272
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1266
1275
LIBS = @LIBS@
1267
1276
LIBTOOL = @LIBTOOL@
1268
1277
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1269
diff -r 85ce661bd25c patch_info/userstats.info
1278
diff -r 592f6c3641ba patch_info/userstats.info
1270
1279
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
1271
+++ b/patch_info/userstats.info Wed Jul 29 00:09:56 2009 -0700
1280
+++ b/patch_info/userstats.info Wed Jul 29 13:34:11 2009 -0700
1272
1281
@@ -0,0 +1,14 @@
1273
1282
+File=userstatsv2.patch
1274
1283
+Name=SHOW USER/TABLE/INDEX statistics
1284
1293
+
1285
1294
+2008-12-09
1286
1295
+YK: fixed "Row_sent: 0" problem at microslow_innodb.patch
1287
diff -r 85ce661bd25c pstack/Makefile.in
1288
--- a/pstack/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1289
+++ b/pstack/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1296
diff -r 592f6c3641ba pstack/Makefile.in
1297
--- a/pstack/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1298
+++ b/pstack/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1290
1299
@@ -196,6 +196,7 @@
1291
1300
LIBDL = @LIBDL@
1292
1301
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1295
1304
LIBS = @LIBS@
1296
1305
LIBTOOL = @LIBTOOL@
1297
1306
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1298
diff -r 85ce661bd25c pstack/aout/Makefile.in
1299
--- a/pstack/aout/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1300
+++ b/pstack/aout/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1307
diff -r 592f6c3641ba pstack/aout/Makefile.in
1308
--- a/pstack/aout/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1309
+++ b/pstack/aout/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1301
1310
@@ -134,6 +134,7 @@
1302
1311
LIBDL = @LIBDL@
1303
1312
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1306
1315
LIBS = @LIBS@
1307
1316
LIBTOOL = @LIBTOOL@
1308
1317
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1309
diff -r 85ce661bd25c regex/Makefile.in
1310
--- a/regex/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1311
+++ b/regex/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1318
diff -r 592f6c3641ba regex/Makefile.in
1319
--- a/regex/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1320
+++ b/regex/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1312
1321
@@ -180,6 +180,7 @@
1313
1322
LIBDL = @LIBDL@
1314
1323
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1317
1326
LIBS = @LIBS@
1318
1327
LIBTOOL = @LIBTOOL@
1319
1328
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1320
diff -r 85ce661bd25c scripts/Makefile.in
1321
--- a/scripts/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1322
+++ b/scripts/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1329
diff -r 592f6c3641ba scripts/Makefile.in
1330
--- a/scripts/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1331
+++ b/scripts/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1323
1332
@@ -176,6 +176,7 @@
1324
1333
LIBDL = @LIBDL@
1325
1334
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1328
1337
LIBS = @LIBS@
1329
1338
LIBTOOL = @LIBTOOL@
1330
1339
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1331
diff -r 85ce661bd25c server-tools/Makefile.in
1332
--- a/server-tools/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1333
+++ b/server-tools/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1340
diff -r 592f6c3641ba server-tools/Makefile.in
1341
--- a/server-tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1342
+++ b/server-tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1334
1343
@@ -155,6 +155,7 @@
1335
1344
LIBDL = @LIBDL@
1336
1345
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1339
1348
LIBS = @LIBS@
1340
1349
LIBTOOL = @LIBTOOL@
1341
1350
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1342
diff -r 85ce661bd25c server-tools/instance-manager/Makefile.in
1343
--- a/server-tools/instance-manager/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1344
+++ b/server-tools/instance-manager/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1351
diff -r 592f6c3641ba server-tools/instance-manager/Makefile.in
1352
--- a/server-tools/instance-manager/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1353
+++ b/server-tools/instance-manager/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1345
1354
@@ -205,6 +205,7 @@
1346
1355
LIBDL = @LIBDL@
1347
1356
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1350
1359
LIBS = @LIBS@
1351
1360
LIBTOOL = @LIBTOOL@
1352
1361
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1353
diff -r 85ce661bd25c sql/Makefile.in
1354
--- a/sql/Makefile.in Wed Jul 29 00:09:40 2009 -0700
1355
+++ b/sql/Makefile.in Wed Jul 29 00:09:56 2009 -0700
1362
diff -r 592f6c3641ba sql/Makefile.in
1363
--- a/sql/Makefile.in Wed Jul 29 13:33:34 2009 -0700
1364
+++ b/sql/Makefile.in Wed Jul 29 13:34:11 2009 -0700
1356
1365
@@ -274,6 +274,7 @@
1357
1366
LIBDL = @LIBDL@
1358
1367
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
1361
1370
LIBS = @LIBS@
1362
1371
LIBTOOL = @LIBTOOL@
1363
1372
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
1364
diff -r 85ce661bd25c sql/ha_innodb.cc
1365
--- a/sql/ha_innodb.cc Wed Jul 29 00:09:40 2009 -0700
1366
+++ b/sql/ha_innodb.cc Wed Jul 29 00:09:56 2009 -0700
1373
diff -r 592f6c3641ba sql/ha_innodb.cc
1374
--- a/sql/ha_innodb.cc Wed Jul 29 13:33:34 2009 -0700
1375
+++ b/sql/ha_innodb.cc Wed Jul 29 13:34:11 2009 -0700
1367
1376
@@ -3341,6 +3341,8 @@
1368
1377
1369
1378
error = row_insert_for_mysql((byte*) record, prebuilt);
1401
1410
1402
1411
} else if (ret == DB_RECORD_NOT_FOUND) {
1403
1412
error = HA_ERR_END_OF_FILE;
1404
diff -r 85ce661bd25c sql/ha_myisam.cc
1405
--- a/sql/ha_myisam.cc Wed Jul 29 00:09:40 2009 -0700
1406
+++ b/sql/ha_myisam.cc Wed Jul 29 00:09:56 2009 -0700
1413
diff -r 592f6c3641ba sql/ha_myisam.cc
1414
--- a/sql/ha_myisam.cc Wed Jul 29 13:33:34 2009 -0700
1415
+++ b/sql/ha_myisam.cc Wed Jul 29 13:34:11 2009 -0700
1407
1416
@@ -670,7 +670,9 @@
1408
1417
if ((error= update_auto_increment()))
1409
1418
return error;
1563
1572
return error;
1564
1573
}
1565
1574
1566
diff -r 85ce661bd25c sql/handler.cc
1567
--- a/sql/handler.cc Wed Jul 29 00:09:40 2009 -0700
1568
+++ b/sql/handler.cc Wed Jul 29 00:09:56 2009 -0700
1575
diff -r 592f6c3641ba sql/handler.cc
1576
--- a/sql/handler.cc Wed Jul 29 13:33:34 2009 -0700
1577
+++ b/sql/handler.cc Wed Jul 29 13:34:11 2009 -0700
1569
1578
@@ -726,6 +726,8 @@
1570
1579
if (cookie)
1571
1580
tc_log->unlog(cookie, xid);
1712
1721
1713
1722
/****************************************************************************
1714
1723
** Some general functions that isn't in the handler class
1715
diff -r 85ce661bd25c sql/handler.h
1716
--- a/sql/handler.h Wed Jul 29 00:09:40 2009 -0700
1717
+++ b/sql/handler.h Wed Jul 29 00:09:56 2009 -0700
1724
diff -r 592f6c3641ba sql/handler.h
1725
--- a/sql/handler.h Wed Jul 29 13:33:34 2009 -0700
1726
+++ b/sql/handler.h Wed Jul 29 13:34:11 2009 -0700
1718
1727
@@ -32,6 +32,10 @@
1719
1728
#define USING_TRANSACTIONS
1720
1729
#endif
1772
1781
/*
1773
1782
default rename_table() and delete_table() rename/delete files with a
1774
1783
given name and extensions from bas_ext()
1775
diff -r 85ce661bd25c sql/lex.h
1776
--- a/sql/lex.h Wed Jul 29 00:09:40 2009 -0700
1777
+++ b/sql/lex.h Wed Jul 29 00:09:56 2009 -0700
1778
@@ -238,6 +238,7 @@
1784
diff -r 592f6c3641ba sql/lex.h
1785
--- a/sql/lex.h Wed Jul 29 13:33:34 2009 -0700
1786
+++ b/sql/lex.h Wed Jul 29 13:34:11 2009 -0700
1787
@@ -109,6 +109,7 @@
1788
{ "CHECKSUM", SYM(CHECKSUM_SYM)},
1789
{ "CIPHER", SYM(CIPHER_SYM)},
1790
{ "CLIENT", SYM(CLIENT_SYM)},
1791
+ { "CLIENT_STATISTICS", SYM(CLIENT_STATS_SYM)},
1792
{ "CLOSE", SYM(CLOSE_SYM)},
1793
{ "CODE", SYM(CODE_SYM)},
1794
{ "COLLATE", SYM(COLLATE_SYM)},
1795
@@ -238,6 +239,7 @@
1779
1796
{ "IN", SYM(IN_SYM)},
1780
1797
{ "INDEX", SYM(INDEX_SYM)},
1781
1798
{ "INDEXES", SYM(INDEXES)},
1783
1800
{ "INFILE", SYM(INFILE)},
1784
1801
{ "INNER", SYM(INNER_SYM)},
1785
1802
{ "INNOBASE", SYM(INNOBASE_SYM)},
1786
@@ -443,6 +444,7 @@
1803
@@ -443,6 +445,7 @@
1787
1804
{ "SIGNED", SYM(SIGNED_SYM)},
1788
1805
{ "SIMPLE", SYM(SIMPLE_SYM)},
1789
1806
{ "SLAVE", SYM(SLAVE)},
1791
1808
{ "SNAPSHOT", SYM(SNAPSHOT_SYM)},
1792
1809
{ "SMALLINT", SYM(SMALLINT)},
1793
1810
{ "SOME", SYM(ANY_SYM)},
1794
@@ -488,6 +490,7 @@
1811
@@ -488,6 +491,7 @@
1795
1812
{ "TABLE", SYM(TABLE_SYM)},
1796
1813
{ "TABLES", SYM(TABLES)},
1797
1814
{ "TABLESPACE", SYM(TABLESPACE)},
1799
1816
{ "TEMPORARY", SYM(TEMPORARY)},
1800
1817
{ "TEMPTABLE", SYM(TEMPTABLE_SYM)},
1801
1818
{ "TERMINATED", SYM(TERMINATED)},
1802
@@ -525,6 +528,7 @@
1819
@@ -525,6 +529,7 @@
1803
1820
{ "USE", SYM(USE_SYM)},
1804
1821
{ "USER", SYM(USER)},
1805
1822
{ "USER_RESOURCES", SYM(RESOURCES)},
1807
1824
{ "USE_FRM", SYM(USE_FRM)},
1808
1825
{ "USING", SYM(USING)},
1809
1826
{ "UTC_DATE", SYM(UTC_DATE_SYM)},
1810
diff -r 85ce661bd25c sql/log.cc
1811
--- a/sql/log.cc Wed Jul 29 00:09:40 2009 -0700
1812
+++ b/sql/log.cc Wed Jul 29 00:09:56 2009 -0700
1827
diff -r 592f6c3641ba sql/log.cc
1828
--- a/sql/log.cc Wed Jul 29 13:33:34 2009 -0700
1829
+++ b/sql/log.cc Wed Jul 29 13:34:11 2009 -0700
1813
1830
@@ -1958,18 +1958,24 @@
1814
1831
thd->current_insert_id);
1815
1832
if (e.write(file))
1887
1904
#ifndef DBUG_OFF
1888
1905
DBUG_skip_commit:
1889
1906
#endif
1890
diff -r 85ce661bd25c sql/mysql_priv.h
1891
--- a/sql/mysql_priv.h Wed Jul 29 00:09:40 2009 -0700
1892
+++ b/sql/mysql_priv.h Wed Jul 29 00:09:56 2009 -0700
1893
@@ -837,7 +837,13 @@
1907
diff -r 592f6c3641ba sql/mysql_priv.h
1908
--- a/sql/mysql_priv.h Wed Jul 29 13:33:34 2009 -0700
1909
+++ b/sql/mysql_priv.h Wed Jul 29 13:34:11 2009 -0700
1910
@@ -837,7 +837,15 @@
1894
1911
bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);
1895
1912
void init_max_user_conn(void);
1896
1913
void init_update_queries(void);
1897
1914
+void init_global_user_stats(void);
1898
1915
+void init_global_table_stats(void);
1899
1916
+void init_global_index_stats(void);
1917
+void init_global_client_stats(void);
1900
1918
void free_max_user_conn(void);
1901
1919
+void free_global_user_stats(void);
1902
1920
+void free_global_table_stats(void);
1903
1921
+void free_global_index_stats(void);
1922
+void free_global_client_stats(void);
1904
1923
pthread_handler_t handle_one_connection(void *arg);
1905
1924
pthread_handler_t handle_bootstrap(void *arg);
1906
1925
void end_thread(THD *thd,bool put_in_cache);
1907
@@ -1416,6 +1422,7 @@
1926
@@ -1416,6 +1424,7 @@
1908
1927
extern ulong max_connections,max_connect_errors, connect_timeout;
1909
1928
extern ulong slave_net_timeout, slave_trans_retries;
1910
1929
extern uint max_user_connections;
1912
1931
extern ulong what_to_log,flush_time;
1913
1932
extern ulong query_buff_size, thread_stack;
1914
1933
extern ulong max_prepared_stmt_count, prepared_stmt_count;
1915
@@ -1446,6 +1453,7 @@
1934
@@ -1446,6 +1455,7 @@
1916
1935
extern my_bool opt_safe_show_db, opt_local_infile;
1917
1936
extern my_bool opt_slave_compressed_protocol, use_temp_pool;
1918
1937
extern my_bool opt_readonly, lower_case_file_system;
1920
1939
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
1921
1940
extern my_bool opt_secure_auth;
1922
1941
extern char* opt_secure_file_priv;
1923
@@ -1493,6 +1501,13 @@
1942
@@ -1493,6 +1503,14 @@
1924
1943
extern struct system_variables max_system_variables;
1925
1944
extern struct system_status_var global_status_var;
1926
1945
extern struct rand_struct sql_rand;
1927
1946
+extern HASH global_user_stats;
1947
+extern HASH global_client_stats;
1928
1948
+extern pthread_mutex_t LOCK_global_user_client_stats;
1929
1949
+extern HASH global_table_stats;
1930
1950
+extern pthread_mutex_t LOCK_global_table_stats;
1934
1954
1935
1955
extern const char *opt_date_time_formats[];
1936
1956
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
1937
diff -r 85ce661bd25c sql/mysqld.cc
1938
--- a/sql/mysqld.cc Wed Jul 29 00:09:40 2009 -0700
1939
+++ b/sql/mysqld.cc Wed Jul 29 00:09:56 2009 -0700
1957
diff -r 592f6c3641ba sql/mysqld.cc
1958
--- a/sql/mysqld.cc Wed Jul 29 13:33:34 2009 -0700
1959
+++ b/sql/mysqld.cc Wed Jul 29 13:34:11 2009 -0700
1940
1960
@@ -417,6 +417,7 @@
1941
1961
uint opt_large_page_size= 0;
1942
1962
my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
1964
1984
/*
1965
1985
The below lock protects access to two global server variables:
1966
1986
max_prepared_stmt_count and prepared_stmt_count. These variables
1967
@@ -1196,6 +1202,9 @@
1987
@@ -1196,6 +1202,10 @@
1968
1988
x_free(opt_secure_file_priv);
1969
1989
bitmap_free(&temp_pool);
1970
1990
free_max_user_conn();
1971
1991
+ free_global_user_stats();
1992
+ free_global_client_stats();
1972
1993
+ free_global_table_stats();
1973
1994
+ free_global_index_stats();
1974
1995
#ifdef HAVE_REPLICATION
1975
1996
end_slave_list();
1976
1997
free_list(&replicate_do_db);
1977
@@ -1310,6 +1319,10 @@
1998
@@ -1310,6 +1320,10 @@
1978
1999
(void) pthread_cond_destroy(&COND_thread_cache);
1979
2000
(void) pthread_cond_destroy(&COND_flush_thread_cache);
1980
2001
(void) pthread_cond_destroy(&COND_manager);
1985
2006
}
1986
2007
1987
2008
#endif /*EMBEDDED_LIBRARY*/
1988
@@ -3157,6 +3170,10 @@
2009
@@ -3157,6 +3171,10 @@
1989
2010
(void) pthread_mutex_init(&LOCK_rpl_status, MY_MUTEX_INIT_FAST);
1990
2011
(void) pthread_cond_init(&COND_rpl_status, NULL);
1991
2012
#endif
1996
2017
sp_cache_init();
1997
2018
/* Parameter for threads created for connections */
1998
2019
(void) pthread_attr_init(&connection_attrib);
1999
@@ -3428,6 +3445,10 @@
2020
@@ -3428,6 +3446,10 @@
2000
2021
sql_print_error("Out of memory");
2001
2022
unireg_abort(1);
2002
2023
}
2007
2028
if (ha_init())
2008
2029
{
2009
2030
sql_print_error("Can't init databases");
2010
@@ -3510,6 +3531,7 @@
2031
@@ -3510,6 +3532,8 @@
2011
2032
2012
2033
init_max_user_conn();
2013
2034
init_update_queries();
2014
2035
+ init_global_user_stats();
2036
+ init_global_client_stats();
2015
2037
DBUG_RETURN(0);
2016
2038
}
2017
2039
2018
@@ -4236,6 +4258,7 @@
2040
@@ -4236,6 +4260,7 @@
2019
2041
{
2020
2042
DBUG_PRINT("error",("Too many connections"));
2021
2043
close_connection(thd, ER_CON_COUNT_ERROR, 1);
2023
2045
delete thd;
2024
2046
DBUG_VOID_RETURN;
2025
2047
}
2026
@@ -5056,6 +5079,7 @@
2048
@@ -5056,6 +5081,7 @@
2027
2049
OPT_PROFILING_USE_GETRUSAGE,
2028
2050
OPT_SLOW_LOG,
2029
2051
OPT_SLOW_QUERY_LOG_FILE,
2031
2053
OPT_USE_GLOBAL_LONG_QUERY_TIME,
2032
2054
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
2033
2055
OPT_SECURE_FILE_PRIV,
2034
@@ -6523,6 +6547,10 @@
2056
@@ -6523,6 +6549,10 @@
2035
2057
(gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,
2036
2058
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
2037
2059
0, 1, 0},
2038
2060
+ {"userstat_running", OPT_USERSTAT_RUNNING,
2039
+ "Control USER_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS running",
2061
+ "Control USER_STATISTICS, CLIENT_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS running",
2040
2062
+ (gptr*) &opt_userstat_running, (gptr*) &opt_userstat_running,
2041
2063
+ 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
2042
2064
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
2043
2065
};
2044
2066
2045
diff -r 85ce661bd25c sql/set_var.cc
2046
--- a/sql/set_var.cc Wed Jul 29 00:09:40 2009 -0700
2047
+++ b/sql/set_var.cc Wed Jul 29 00:09:56 2009 -0700
2067
diff -r 592f6c3641ba sql/set_var.cc
2068
--- a/sql/set_var.cc Wed Jul 29 13:33:34 2009 -0700
2069
+++ b/sql/set_var.cc Wed Jul 29 13:34:11 2009 -0700
2048
2070
@@ -325,6 +325,7 @@
2049
2071
sys_var_thd_ulong sys_read_buff_size("read_buffer_size",
2050
2072
&SV::read_buff_size);
2069
2091
{sys_use_global_long_query_time.name, (char*) &sys_use_global_long_query_time, SHOW_SYS},
2070
2092
{sys_version.name, (char*) &sys_version, SHOW_SYS},
2071
2093
#ifdef HAVE_BERKELEY_DB
2072
diff -r 85ce661bd25c sql/share/Makefile.in
2073
--- a/sql/share/Makefile.in Wed Jul 29 00:09:40 2009 -0700
2074
+++ b/sql/share/Makefile.in Wed Jul 29 00:09:56 2009 -0700
2094
diff -r 592f6c3641ba sql/share/Makefile.in
2095
--- a/sql/share/Makefile.in Wed Jul 29 13:33:34 2009 -0700
2096
+++ b/sql/share/Makefile.in Wed Jul 29 13:34:11 2009 -0700
2075
2097
@@ -144,6 +144,7 @@
2076
2098
LIBDL = @LIBDL@
2077
2099
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
2080
2102
LIBS = @LIBS@
2081
2103
LIBTOOL = @LIBTOOL@
2082
2104
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
2083
diff -r 85ce661bd25c sql/sql_base.cc
2084
--- a/sql/sql_base.cc Wed Jul 29 00:09:40 2009 -0700
2085
+++ b/sql/sql_base.cc Wed Jul 29 00:09:56 2009 -0700
2105
diff -r 592f6c3641ba sql/sql_base.cc
2106
--- a/sql/sql_base.cc Wed Jul 29 13:33:34 2009 -0700
2107
+++ b/sql/sql_base.cc Wed Jul 29 13:34:11 2009 -0700
2086
2108
@@ -624,6 +624,12 @@
2087
2109
DBUG_ENTER("close_thread_table");
2088
2110
DBUG_ASSERT(table->key_read == 0);
2106
2128
db_type table_type=table->s->db_type;
2107
2129
strmov(path,table->s->path);
2108
2130
free_io_cache(table);
2109
diff -r 85ce661bd25c sql/sql_class.cc
2110
--- a/sql/sql_class.cc Wed Jul 29 00:09:40 2009 -0700
2111
+++ b/sql/sql_class.cc Wed Jul 29 00:09:56 2009 -0700
2131
diff -r 592f6c3641ba sql/sql_class.cc
2132
--- a/sql/sql_class.cc Wed Jul 29 13:33:34 2009 -0700
2133
+++ b/sql/sql_class.cc Wed Jul 29 13:34:11 2009 -0700
2112
2134
@@ -239,6 +239,13 @@
2113
2135
bzero(ha_data, sizeof(ha_data));
2114
2136
mysys_var=0;
2278
2300
}
2279
2301
2280
2302
2281
diff -r 85ce661bd25c sql/sql_class.h
2282
--- a/sql/sql_class.h Wed Jul 29 00:09:40 2009 -0700
2283
+++ b/sql/sql_class.h Wed Jul 29 00:09:56 2009 -0700
2303
diff -r 592f6c3641ba sql/sql_class.h
2304
--- a/sql/sql_class.h Wed Jul 29 13:33:34 2009 -0700
2305
+++ b/sql/sql_class.h Wed Jul 29 13:34:11 2009 -0700
2284
2306
@@ -1302,6 +1302,8 @@
2285
2307
first byte of the packet in do_command()
2286
2308
*/
2376
2398
public:
2377
2399
/**
2378
2400
Add an internal error handler to the thread execution context.
2379
@@ -1935,6 +1993,11 @@
2401
@@ -1935,6 +1993,10 @@
2380
2402
MEM_ROOT main_mem_root;
2381
2403
};
2382
2404
2384
2406
+// 'client'. Does not allocate memory. May return "".
2385
2407
+const char *get_client_host(THD *client);
2386
2408
+
2387
+#define LIST_PROCESS_HOST_LEN 64
2388
2409
2389
2410
#define tmp_disable_binlog(A) \
2390
2411
{ulonglong tmp_disable_binlog__save_options= (A)->options; \
2391
diff -r 85ce661bd25c sql/sql_delete.cc
2392
--- a/sql/sql_delete.cc Wed Jul 29 00:09:40 2009 -0700
2393
+++ b/sql/sql_delete.cc Wed Jul 29 00:09:56 2009 -0700
2412
diff -r 592f6c3641ba sql/sql_delete.cc
2413
--- a/sql/sql_delete.cc Wed Jul 29 13:33:34 2009 -0700
2414
+++ b/sql/sql_delete.cc Wed Jul 29 13:34:11 2009 -0700
2394
2415
@@ -358,6 +358,7 @@
2395
2416
send_ok(thd,deleted);
2396
2417
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
2407
2428
return 0;
2408
2429
}
2409
2430
2410
diff -r 85ce661bd25c sql/sql_insert.cc
2411
--- a/sql/sql_insert.cc Wed Jul 29 00:09:40 2009 -0700
2412
+++ b/sql/sql_insert.cc Wed Jul 29 00:09:56 2009 -0700
2431
diff -r 592f6c3641ba sql/sql_insert.cc
2432
--- a/sql/sql_insert.cc Wed Jul 29 13:33:34 2009 -0700
2433
+++ b/sql/sql_insert.cc Wed Jul 29 13:34:11 2009 -0700
2413
2434
@@ -990,6 +990,7 @@
2414
2435
thd->row_count_func= info.copied + info.deleted + updated;
2415
2436
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
2426
2447
DBUG_RETURN(0);
2427
2448
}
2428
2449
2429
diff -r 85ce661bd25c sql/sql_lex.h
2430
--- a/sql/sql_lex.h Wed Jul 29 00:09:40 2009 -0700
2431
+++ b/sql/sql_lex.h Wed Jul 29 00:09:56 2009 -0700
2432
@@ -101,6 +101,8 @@
2450
diff -r 592f6c3641ba sql/sql_lex.h
2451
--- a/sql/sql_lex.h Wed Jul 29 13:33:34 2009 -0700
2452
+++ b/sql/sql_lex.h Wed Jul 29 13:34:11 2009 -0700
2453
@@ -101,6 +101,9 @@
2433
2454
When a command is added here, be sure it's also added in mysqld.cc
2434
2455
in "struct show_var_st status_vars[]= {" ...
2435
2456
*/
2436
2457
+ // TODO(mcallaghan): update status_vars in mysqld to export these
2437
2458
+ SQLCOM_SHOW_USER_STATS, SQLCOM_SHOW_TABLE_STATS, SQLCOM_SHOW_INDEX_STATS,
2459
+ SQLCOM_SHOW_CLIENT_STATS,
2438
2460
/* This should be the last !!! */
2439
2461
SQLCOM_END
2440
2462
};
2441
diff -r 85ce661bd25c sql/sql_parse.cc
2442
--- a/sql/sql_parse.cc Wed Jul 29 00:09:40 2009 -0700
2443
+++ b/sql/sql_parse.cc Wed Jul 29 00:09:56 2009 -0700
2463
diff -r 592f6c3641ba sql/sql_parse.cc
2464
--- a/sql/sql_parse.cc Wed Jul 29 13:33:34 2009 -0700
2465
+++ b/sql/sql_parse.cc Wed Jul 29 13:34:11 2009 -0700
2444
2466
@@ -78,6 +78,12 @@
2445
2467
const char *table_name);
2446
2468
static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
2454
2476
const char *any_db="*any*"; // Special symbol for check_access
2455
2477
2456
2478
const char *command_name[]={
2457
@@ -146,6 +152,16 @@
2479
@@ -146,6 +152,17 @@
2458
2480
static bool do_command(THD *thd);
2459
2481
#endif // EMBEDDED_LIBRARY
2460
2482
2461
2483
+HASH global_user_stats;
2484
+HASH global_client_stats;
2462
2485
+// Protects global_user_stats and global_client_stats
2463
2486
+extern pthread_mutex_t LOCK_global_user_client_stats;
2464
2487
+
2471
2494
#ifdef __WIN__
2472
2495
extern void win_install_sigabrt_handler(void);
2473
2496
#endif
2474
@@ -504,6 +520,7 @@
2497
@@ -504,6 +521,7 @@
2475
2498
mysql_log.write(thd,COM_CONNECT,"%s",ER(ER_NOT_SUPPORTED_AUTH_MODE));
2476
2499
DBUG_RETURN(-1);
2477
2500
}
2479
2502
net_printf_error(thd, ER_ACCESS_DENIED_ERROR,
2480
2503
thd->main_security_ctx.user,
2481
2504
thd->main_security_ctx.host_or_ip,
2482
@@ -536,12 +553,181 @@
2505
@@ -536,12 +554,190 @@
2483
2506
void init_max_user_conn(void)
2484
2507
{
2485
2508
#ifndef NO_EMBEDDED_ACCESS_CHECKS
2619
2642
+ }
2620
2643
+}
2621
2644
+
2645
+void init_global_client_stats(void)
2646
+{
2647
+ if (hash_init(&global_client_stats, system_charset_info, max_connections,
2648
+ 0, 0, (hash_get_key)get_key_user_stats,
2649
+ (hash_free_key)free_user_stats, 0)) {
2650
+ sql_print_error("Initializing global_client_stats failed.");
2651
+ exit(1);
2652
+ }
2653
+}
2622
2654
+
2623
2655
+extern "C" byte *get_key_table_stats(TABLE_STATS *table_stats, uint *length,
2624
2656
+ my_bool not_used __attribute__((unused)))
2667
2699
2668
2700
2669
2701
/*
2670
@@ -599,7 +785,10 @@
2702
@@ -599,7 +795,10 @@
2671
2703
2672
2704
end:
2673
2705
if (error)
2678
2710
(void) pthread_mutex_unlock(&LOCK_user_conn);
2679
2711
DBUG_RETURN(error);
2680
2712
}
2681
@@ -646,6 +835,20 @@
2713
@@ -646,6 +845,25 @@
2682
2714
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
2683
2715
}
2684
2716
2696
2728
+{
2697
2729
+ hash_free(&global_index_stats);
2698
2730
+}
2731
+
2732
+void free_global_client_stats(void)
2733
+{
2734
+ hash_free(&global_client_stats);
2735
+}
2699
2736
2700
2737
2701
2738
/*
2702
@@ -698,6 +901,178 @@
2739
@@ -698,6 +916,214 @@
2703
2740
return uc_update_queries[command] != 0;
2704
2741
}
2705
2742
2771
2808
+ return_value = 1;
2772
2809
+ goto end;
2773
2810
+ }
2811
+ if (increment_count_by_name(client_string,
2812
+ user_string,
2813
+ &global_client_stats, thd))
2814
+ {
2815
+ return_value = 1;
2816
+ goto end;
2817
+ }
2774
2818
+
2775
2819
+end:
2776
2820
+ if (use_lock) pthread_mutex_unlock(&LOCK_global_user_client_stats);
2808
2852
+{
2809
2853
+ if (opt_userstat_running) {
2810
2854
+ char* user_string = get_valid_user_string(thd->main_security_ctx.user);
2855
+ const char* client_string = get_client_host(thd);
2811
2856
+
2812
2857
+ USER_STATS* user_stats;
2813
2858
+ pthread_mutex_lock(&LOCK_global_user_client_stats);
2826
2871
+ }
2827
2872
+ }
2828
2873
+
2874
+ // Update by client IP
2875
+ if ((user_stats = (USER_STATS*)hash_search(&global_client_stats,
2876
+ (byte*)client_string,
2877
+ strlen(client_string)))) {
2878
+ // Found by client IP
2879
+ update_global_user_stats_with_user(thd, user_stats, now);
2880
+ } else {
2881
+ // Create the entry
2882
+ if (create_user) {
2883
+ increment_count_by_name(client_string,
2884
+ user_string,
2885
+ &global_client_stats, thd);
2886
+ }
2887
+ }
2829
2888
+ thd->reset_diff_stats();
2830
2889
+
2831
2890
+ pthread_mutex_unlock(&LOCK_global_user_client_stats);
2847
2906
+ user_stats = (USER_STATS*)hash_element(&global_user_stats, i);
2848
2907
+ user_stats->concurrent_connections = 0;
2849
2908
+ }
2909
+ for (int i = 0; i < global_client_stats.records; ++i) {
2910
+ user_stats = (USER_STATS*)hash_element(&global_client_stats, i);
2911
+ user_stats->concurrent_connections = 0;
2912
+ }
2850
2913
+
2851
2914
+ I_List_iterator<THD> it(threads);
2852
2915
+ THD* thd;
2869
2932
+ }
2870
2933
+ }
2871
2934
+
2935
+ const char* client_string = get_client_host(thd);
2936
+ if ((user_stats = (USER_STATS*)hash_search(&global_client_stats,
2937
+ (byte*)client_string,
2938
+ strlen(client_string)))) {
2939
+ // Found user.
2940
+ user_stats->concurrent_connections++;
2941
+ update_global_user_stats_with_user(thd, user_stats, now);
2942
+ } else {
2943
+ // Do nothing, unlike what is done for global_user_stats
2944
+ }
2872
2945
+ thd->reset_diff_stats();
2873
2946
+ }
2874
2947
+ pthread_mutex_unlock(&LOCK_thread_count);
2878
2951
/*
2879
2952
Reset per-hour user resource limits when it has been more than
2880
2953
an hour since they were last checked
2881
@@ -1184,6 +1559,8 @@
2954
@@ -1184,6 +1610,8 @@
2882
2955
my_net_set_read_timeout(net, connect_timeout);
2883
2956
my_net_set_write_timeout(net, connect_timeout);
2884
2957
2887
2960
if ((error=check_connection(thd)))
2888
2961
{ // Wrong permissions
2889
2962
if (error > 0)
2890
@@ -1193,8 +1570,22 @@
2963
@@ -1193,8 +1621,22 @@
2891
2964
my_sleep(1000); /* must wait after eof() */
2892
2965
#endif
2893
2966
statistic_increment(aborted_connects,&LOCK_status);
2910
2983
#ifdef __NETWARE__
2911
2984
netware_reg_user(sctx->ip, sctx->user, "MySQL");
2912
2985
#endif
2913
@@ -1251,6 +1642,7 @@
2986
@@ -1251,6 +1693,7 @@
2914
2987
(net->vio && net->error && net->report_error))
2915
2988
{
2916
2989
statistic_increment(aborted_threads, &LOCK_status);
2918
2991
}
2919
2992
2920
2993
if (net->error && net->vio != 0 && net->report_error)
2921
@@ -1270,6 +1662,8 @@
2994
@@ -1270,6 +1713,8 @@
2922
2995
2923
2996
end_thread:
2924
2997
close_connection(thd, 0, 1);
2927
3000
end_thread(thd,1);
2928
3001
/*
2929
3002
If end_thread returns, we are either running with --one-thread
2930
@@ -1601,6 +1995,13 @@
3003
@@ -1601,6 +2046,13 @@
2931
3004
2932
3005
thd->clear_error(); // Clear error message
2933
3006
2941
3014
net_new_transaction(net);
2942
3015
2943
3016
packet_length= my_net_read(net);
2944
@@ -1759,6 +2160,9 @@
3017
@@ -1759,6 +2211,9 @@
2945
3018
}
2946
3019
2947
3020
thd->command=command;
2951
3024
/*
2952
3025
Commands which always take a long time are logged into
2953
3026
the slow log only if opt_log_slow_admin_statements is set.
2954
@@ -4539,6 +4943,15 @@
3027
@@ -4539,6 +4994,15 @@
2955
3028
if (check_global_access(thd,RELOAD_ACL))
2956
3029
goto error;
2957
3030
2967
3040
/*
2968
3041
reload_acl_and_cache() will tell us if we are allowed to write to the
2969
3042
binlog or not.
2970
@@ -4847,6 +5260,7 @@
3043
@@ -4847,6 +5311,7 @@
2971
3044
{
2972
3045
if (check_global_access(thd, SUPER_ACL))
2973
3046
{
2975
3048
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
2976
3049
goto create_sp_error;
2977
3050
}
2978
@@ -5691,6 +6105,7 @@
3051
@@ -5691,6 +6156,7 @@
2979
3052
if (!no_errors)
2980
3053
{
2981
3054
const char *db_name= db ? db : thd->db;
2983
3056
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
2984
3057
sctx->priv_user, sctx->priv_host, db_name);
2985
3058
}
2986
@@ -5726,6 +6141,7 @@
3059
@@ -5726,6 +6192,7 @@
2987
3060
{ // We can never grant this
2988
3061
DBUG_PRINT("error",("No possible access"));
2989
3062
if (!no_errors)
2991
3064
my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
2992
3065
sctx->priv_user,
2993
3066
sctx->priv_host,
2994
@@ -5758,11 +6174,15 @@
3067
@@ -5758,11 +6225,15 @@
2995
3068
2996
3069
DBUG_PRINT("error",("Access denied"));
2997
3070
if (!no_errors)
3007
3080
DBUG_RETURN(TRUE); /* purecov: tested */
3008
3081
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
3009
3082
}
3010
@@ -5796,6 +6216,7 @@
3083
@@ -5796,6 +6267,7 @@
3011
3084
if ((thd->security_ctx->master_access & want_access))
3012
3085
return 0;
3013
3086
get_privilege_desc(command, sizeof(command), want_access);
3015
3088
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
3016
3089
return 1;
3017
3090
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
3018
@@ -5828,6 +6249,7 @@
3091
@@ -5828,6 +6300,7 @@
3019
3092
3020
3093
if (!thd->col_access && check_grant_db(thd, dst_db_name))
3021
3094
{
3023
3096
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
3024
3097
thd->security_ctx->priv_user,
3025
3098
thd->security_ctx->priv_host,
3026
@@ -5859,6 +6281,11 @@
3099
@@ -5859,6 +6332,12 @@
3027
3100
check_grant(thd, SELECT_ACL, dst_table, 2, UINT_MAX, FALSE);
3028
3101
}
3029
3102
3030
3103
+
3031
3104
+ case SCH_USER_STATS:
3105
+ case SCH_CLIENT_STATS:
3032
3106
+ return check_global_access(thd, SUPER_ACL | PROCESS_ACL);
3033
3107
+ case SCH_TABLE_STATS:
3034
3108
+ case SCH_INDEX_STATS:
3035
3109
case SCH_OPEN_TABLES:
3036
3110
case SCH_VARIABLES:
3037
3111
case SCH_STATUS:
3038
@@ -5912,8 +6339,8 @@
3112
@@ -5912,8 +6391,8 @@
3039
3113
#ifndef NO_EMBEDDED_ACCESS_CHECKS
3040
3114
TABLE_LIST *org_tables= tables;
3041
3115
#endif
3045
3119
/*
3046
3120
The check that first_not_own_table is not reached is for the case when
3047
3121
the given table list refers to the list for prelocking (contains tables
3048
@@ -5930,9 +6357,12 @@
3122
@@ -5930,9 +6409,12 @@
3049
3123
(want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
3050
3124
{
3051
3125
if (!no_errors)
3058
3132
return TRUE;
3059
3133
}
3060
3134
/*
3061
@@ -6442,6 +6872,30 @@
3135
@@ -6442,6 +6924,30 @@
3062
3136
lex_start(thd);
3063
3137
mysql_reset_thd_for_next_command(thd);
3064
3138
3089
3163
if (query_cache_send_result_to_client(thd, (char*) inBuf, length) <= 0)
3090
3164
{
3091
3165
LEX *lex= thd->lex;
3092
@@ -6520,6 +6974,43 @@
3166
@@ -6520,6 +7026,43 @@
3093
3167
*found_semicolon= NULL;
3094
3168
}
3095
3169
3133
3207
DBUG_VOID_RETURN;
3134
3208
}
3135
3209
3136
@@ -7531,8 +8022,27 @@
3210
@@ -7531,8 +8074,35 @@
3137
3211
pthread_mutex_unlock(&LOCK_active_mi);
3138
3212
}
3139
3213
#endif
3153
3227
+ init_global_index_stats();
3154
3228
+ pthread_mutex_unlock(&LOCK_global_index_stats);
3155
3229
+ }
3156
+ if (options & (REFRESH_USER_STATS))
3230
+ if (options & (REFRESH_USER_STATS | REFRESH_CLIENT_STATS))
3157
3231
+ {
3158
3232
+ pthread_mutex_lock(&LOCK_global_user_client_stats);
3159
+ free_global_user_stats();
3160
+ init_global_user_stats();
3233
+ if (options & REFRESH_USER_STATS)
3234
+ {
3235
+ free_global_user_stats();
3236
+ init_global_user_stats();
3237
+ }
3238
+ if (options & REFRESH_CLIENT_STATS)
3239
+ {
3240
+ free_global_client_stats();
3241
+ init_global_client_stats();
3242
+ }
3161
3243
+ pthread_mutex_unlock(&LOCK_global_user_client_stats);
3162
3244
+ }
3163
3245
*write_to_binlog= tmp_write_to_binlog;
3164
3246
return result;
3165
3247
}
3166
diff -r 85ce661bd25c sql/sql_prepare.cc
3167
--- a/sql/sql_prepare.cc Wed Jul 29 00:09:40 2009 -0700
3168
+++ b/sql/sql_prepare.cc Wed Jul 29 00:09:56 2009 -0700
3248
diff -r 592f6c3641ba sql/sql_prepare.cc
3249
--- a/sql/sql_prepare.cc Wed Jul 29 13:33:34 2009 -0700
3250
+++ b/sql/sql_prepare.cc Wed Jul 29 13:34:11 2009 -0700
3169
3251
@@ -81,6 +81,9 @@
3170
3252
#include <mysql_com.h>
3171
3253
#endif
3501
3583
DBUG_VOID_RETURN;
3502
3584
}
3503
3585
3504
diff -r 85ce661bd25c sql/sql_show.cc
3505
--- a/sql/sql_show.cc Wed Jul 29 00:09:40 2009 -0700
3506
+++ b/sql/sql_show.cc Wed Jul 29 00:09:56 2009 -0700
3586
diff -r 592f6c3641ba sql/sql_show.cc
3587
--- a/sql/sql_show.cc Wed Jul 29 13:33:34 2009 -0700
3588
+++ b/sql/sql_show.cc Wed Jul 29 13:34:11 2009 -0700
3507
3589
@@ -540,6 +540,7 @@
3508
3590
sctx->master_access);
3509
3591
if (!(db_access & DB_ACLS) && (!grant_option || check_grant_db(thd,dbname)))
3512
3594
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
3513
3595
sctx->priv_user, sctx->host_or_ip, dbname);
3514
3596
mysql_log.write(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
3515
@@ -1890,6 +1891,260 @@
3597
@@ -1890,6 +1891,300 @@
3516
3598
DBUG_RETURN(FALSE);
3517
3599
}
3518
3600
3685
3767
+ DBUG_RETURN(1);
3686
3768
+}
3687
3769
+
3770
+/*
3771
+ Process SHOW CLIENT_STATISTICS
3772
+
3773
+ SYNOPSIS
3774
+ mysqld_show_client_stats
3775
+ thd - current thread
3776
+ wild - limit results to the entry for this client
3777
+
3778
+ RETURN
3779
+ 0 - OK
3780
+ 1 - error
3781
+ */
3782
+
3783
+
3784
+int fill_schema_client_stats(THD* thd, TABLE_LIST* tables, COND* cond)
3785
+{
3786
+ TABLE *table= tables->table;
3787
+ DBUG_ENTER("fill_schema_client_stats");
3788
+
3789
+ if (check_global_access(thd, SUPER_ACL | PROCESS_ACL))
3790
+ DBUG_RETURN(1);
3791
+
3792
+ // Iterates through all the global stats and sends them to the client.
3793
+ // Pattern matching on the client IP is supported.
3794
+
3795
+ pthread_mutex_lock(&LOCK_global_user_client_stats);
3796
+ int result= send_user_stats(thd, &global_client_stats, table);
3797
+ pthread_mutex_unlock(&LOCK_global_user_client_stats);
3798
+ if (result)
3799
+ goto err;
3800
+
3801
+ DBUG_PRINT("exit", ("mysqld_show_client_stats result is 0"));
3802
+ DBUG_RETURN(0);
3803
+
3804
+ err:
3805
+ DBUG_PRINT("exit", ("mysqld_show_client_stats result is 1"));
3806
+ DBUG_RETURN(1);
3807
+}
3808
+
3809
+
3688
3810
+// Sends the global table stats back to the client.
3689
3811
+int fill_schema_table_stats(THD* thd, TABLE_LIST* tables, COND* cond)
3690
3812
+{
3773
3895
3774
3896
/* collect status for all running threads */
3775
3897
3776
@@ -4500,6 +4755,50 @@
3898
@@ -4500,6 +4795,77 @@
3777
3899
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
3778
3900
};
3779
3901
3803
3925
+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
3804
3926
+};
3805
3927
+
3928
+ST_FIELD_INFO client_stats_fields_info[]=
3929
+{
3930
+ {"CLIENT", LIST_PROCESS_HOST_LEN, MYSQL_TYPE_STRING, 0, 0, "Client"},
3931
+ {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections"},
3932
+ {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections"},
3933
+ {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time"},
3934
+ {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Busy_time"},
3935
+ {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Cpu_time"},
3936
+ {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_received"},
3937
+ {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_sent"},
3938
+ {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Binlog_bytes_written"},
3939
+ {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_fetched"},
3940
+ {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_updated"},
3941
+ {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Table_rows_read"},
3942
+ {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Select_commands"},
3943
+ {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Update_commands"},
3944
+ {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Other_commands"},
3945
+ {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Commit_transactions"},
3946
+ {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rollback_transactions"},
3947
+ {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Denied_connections"},
3948
+ {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Lost_connections"},
3949
+ {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Access_denied"},
3950
+ {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Empty_queries"},
3951
+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
3952
+};
3953
+
3954
+
3806
3955
+ST_FIELD_INFO table_stats_fields_info[]=
3807
3956
+{
3808
3957
+ {"TABLE_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_schema"},
3824
3973
3825
3974
/*
3826
3975
Description of ST_FIELD_INFO in table.h
3827
@@ -4517,6 +4816,8 @@
3976
@@ -4509,6 +4875,8 @@
3977
{
3978
{"CHARACTER_SETS", charsets_fields_info, create_schema_table,
3979
fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0},
3980
+ {"CLIENT_STATISTICS", client_stats_fields_info, create_schema_table,
3981
+ fill_schema_client_stats, make_old_format, 0, -1, -1, 0},
3982
{"COLLATIONS", collation_fields_info, create_schema_table,
3983
fill_schema_collation, make_old_format, 0, -1, -1, 0},
3984
{"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
3985
@@ -4517,6 +4885,8 @@
3828
3986
get_all_tables, make_columns_old_format, get_schema_column_record, 1, 2, 0},
3829
3987
{"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
3830
3988
fill_schema_column_privileges, 0, 0, -1, -1, 0},
3833
3991
{"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
3834
3992
get_all_tables, 0, get_schema_key_column_usage_record, 4, 5, 0},
3835
3993
{"OPEN_TABLES", open_tables_fields_info, create_schema_table,
3836
@@ -4542,10 +4843,14 @@
3994
@@ -4542,10 +4912,14 @@
3837
3995
get_all_tables, make_table_names_old_format, 0, 1, 2, 1},
3838
3996
{"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
3839
3997
fill_schema_table_privileges, 0, 0, -1, -1, 0},
3848
4006
{"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
3849
4007
make_old_format, 0, -1, -1, 1},
3850
4008
{"VIEWS", view_fields_info, create_schema_table,
3851
diff -r 85ce661bd25c sql/sql_update.cc
3852
--- a/sql/sql_update.cc Wed Jul 29 00:09:40 2009 -0700
3853
+++ b/sql/sql_update.cc Wed Jul 29 00:09:56 2009 -0700
4009
diff -r 592f6c3641ba sql/sql_update.cc
4010
--- a/sql/sql_update.cc Wed Jul 29 13:33:34 2009 -0700
4011
+++ b/sql/sql_update.cc Wed Jul 29 13:34:11 2009 -0700
3854
4012
@@ -601,7 +601,8 @@
3855
4013
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
3856
4014
send_ok(thd, (ulong) thd->row_count_func,
3868
4026
+ thd->updated_row_count += thd->row_count_func;
3869
4027
return FALSE;
3870
4028
}
3871
diff -r 85ce661bd25c sql/sql_yacc.yy
3872
--- a/sql/sql_yacc.yy Wed Jul 29 00:09:40 2009 -0700
3873
+++ b/sql/sql_yacc.yy Wed Jul 29 00:09:56 2009 -0700
3874
@@ -680,6 +680,7 @@
4029
diff -r 592f6c3641ba sql/sql_yacc.yy
4030
--- a/sql/sql_yacc.yy Wed Jul 29 13:33:34 2009 -0700
4031
+++ b/sql/sql_yacc.yy Wed Jul 29 13:34:11 2009 -0700
4032
@@ -523,6 +523,7 @@
4033
%token CHECK_SYM
4034
%token CIPHER_SYM
4035
%token CLIENT_SYM
4036
+%token CLIENT_STATS_SYM
4037
%token CLOSE_SYM
4038
%token COALESCE
4039
%token CODE_SYM
4040
@@ -680,6 +681,7 @@
3875
4041
%token IMPORT
3876
4042
%token INDEXES
3877
4043
%token INDEX_SYM
3879
4045
%token INFILE
3880
4046
%token INNER_SYM
3881
4047
%token INNOBASE_SYM
3882
@@ -909,6 +910,7 @@
4048
@@ -909,6 +911,7 @@
3883
4049
%token SIGNED_SYM
3884
4050
%token SIMPLE_SYM
3885
4051
%token SLAVE
3887
4053
%token SMALLINT
3888
4054
%token SNAPSHOT_SYM
3889
4055
%token SOUNDS_SYM
3890
@@ -949,6 +951,7 @@
4056
@@ -949,6 +952,7 @@
3891
4057
%token TABLES
3892
4058
%token TABLESPACE
3893
4059
%token TABLE_SYM
3895
4061
%token TEMPORARY
3896
4062
%token TEMPTABLE_SYM
3897
4063
%token TERMINATED
3898
@@ -991,6 +994,7 @@
4064
@@ -991,6 +995,7 @@
3899
4065
%token UPGRADE_SYM
3900
4066
%token USAGE
3901
4067
%token USER
3903
4069
%token USE_FRM
3904
4070
%token USE_SYM
3905
4071
%token USING
3906
@@ -8255,6 +8259,30 @@
4072
@@ -8255,6 +8260,38 @@
3907
4073
{
3908
4074
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
3909
4075
}
4076
+ | CLIENT_STATS_SYM wild_and_where
4077
+ {
4078
+ LEX *lex= Lex;
4079
+ Lex->sql_command = SQLCOM_SELECT;
4080
+ lex->orig_sql_command= SQLCOM_SHOW_CLIENT_STATS;
4081
+ if (prepare_schema_table(YYTHD, lex, 0, SCH_CLIENT_STATS))
4082
+ MYSQL_YYABORT;
4083
+ }
3910
4084
+ | USER_STATS_SYM wild_and_where
3911
4085
+ {
3912
4086
+ LEX *lex= Lex;
3934
4108
| CREATE PROCEDURE sp_name
3935
4109
{
3936
4110
LEX *lex= Lex;
3937
@@ -8459,9 +8487,13 @@
4111
@@ -8459,9 +8496,14 @@
3938
4112
| LOGS_SYM { Lex->type|= REFRESH_LOG; }
3939
4113
| STATUS_SYM { Lex->type|= REFRESH_STATUS; }
3940
4114
| SLAVE { Lex->type|= REFRESH_SLAVE; }
3943
4117
| DES_KEY_FILE { Lex->type|= REFRESH_DES_KEY_FILE; }
3944
4118
- | RESOURCES { Lex->type|= REFRESH_USER_RESOURCES; };
3945
4119
+ | RESOURCES { Lex->type|= REFRESH_USER_RESOURCES; }
4120
+ | CLIENT_STATS_SYM { Lex->type|= REFRESH_CLIENT_STATS; }
3946
4121
+ | USER_STATS_SYM { Lex->type|= REFRESH_USER_STATS; }
3947
4122
+ | TABLE_STATS_SYM { Lex->type|= REFRESH_TABLE_STATS; }
3948
4123
+ | INDEX_STATS_SYM { Lex->type|= REFRESH_INDEX_STATS; };
3949
4124
3950
4125
opt_table_list:
3951
4126
/* empty */ {;}
3952
@@ -9502,6 +9534,7 @@
4127
@@ -9450,6 +9492,7 @@
4128
| CHAIN_SYM {}
4129
| CHANGED {}
4130
| CIPHER_SYM {}
4131
+ | CLIENT_STATS_SYM {}
4132
| CLIENT_SYM {}
4133
| CODE_SYM {}
4134
| COLLATION_SYM {}
4135
@@ -9502,6 +9545,7 @@
3953
4136
| HOSTS_SYM {}
3954
4137
| HOUR_SYM {}
3955
4138
| IDENTIFIED_SYM {}
3957
4140
| INVOKER_SYM {}
3958
4141
| IMPORT {}
3959
4142
| INDEXES {}
3960
@@ -9611,6 +9644,7 @@
4143
@@ -9611,6 +9655,7 @@
3961
4144
| SIMPLE_SYM {}
3962
4145
| SHARE_SYM {}
3963
4146
| SHUTDOWN {}
3965
4148
| SNAPSHOT_SYM {}
3966
4149
| SOUNDS_SYM {}
3967
4150
| SOURCE_SYM {}
3968
@@ -9627,6 +9661,7 @@
4151
@@ -9627,6 +9672,7 @@
3969
4152
| SUSPEND_SYM {}
3970
4153
| SWAPS_SYM {}
3971
4154
| SWITCHES_SYM {}
3973
4156
| TABLES {}
3974
4157
| TABLESPACE {}
3975
4158
| TEMPORARY {}
3976
@@ -9647,6 +9682,7 @@
4159
@@ -9647,6 +9693,7 @@
3977
4160
| UNKNOWN_SYM {}
3978
4161
| UNTIL_SYM {}
3979
4162
| USER {}
3981
4164
| USE_FRM {}
3982
4165
| VARIABLES {}
3983
4166
| VIEW_SYM {}
3984
diff -r 85ce661bd25c sql/structs.h
3985
--- a/sql/structs.h Wed Jul 29 00:09:40 2009 -0700
3986
+++ b/sql/structs.h Wed Jul 29 00:09:56 2009 -0700
4167
diff -r 592f6c3641ba sql/structs.h
4168
--- a/sql/structs.h Wed Jul 29 13:33:34 2009 -0700
4169
+++ b/sql/structs.h Wed Jul 29 13:34:11 2009 -0700
3987
4170
@@ -273,6 +273,98 @@
3988
4171
time_t intime;
3989
4172
} USER_CONN;
3990
4173
3991
4174
+typedef struct st_user_stats {
3992
+ char user[USERNAME_LENGTH + 1];
4175
+ char user[max(USERNAME_LENGTH, LIST_PROCESS_HOST_LEN) + 1];
3993
4176
+ // Account name the user is mapped to when this is a user from mapped_user.
3994
4177
+ // Otherwise, the same value as user.
3995
+ char priv_user[USERNAME_LENGTH + 1];
4178
+ char priv_user[max(USERNAME_LENGTH, LIST_PROCESS_HOST_LEN) + 1];
3996
4179
+ uint total_connections;
3997
4180
+ uint concurrent_connections;
3998
4181
+ time_t connected_time; // in seconds
4083
4266
/* Bits in form->update */
4084
4267
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */
4085
4268
#define REG_NEW_RECORD 2 /* Write a new record if not found */
4086
diff -r 85ce661bd25c sql/table.h
4087
--- a/sql/table.h Wed Jul 29 00:09:40 2009 -0700
4088
+++ b/sql/table.h Wed Jul 29 00:09:56 2009 -0700
4089
@@ -375,6 +375,7 @@
4269
diff -r 592f6c3641ba sql/table.h
4270
--- a/sql/table.h Wed Jul 29 13:33:34 2009 -0700
4271
+++ b/sql/table.h Wed Jul 29 13:34:11 2009 -0700
4272
@@ -371,10 +371,12 @@
4273
enum enum_schema_tables
4274
{
4275
SCH_CHARSETS= 0,
4276
+ SCH_CLIENT_STATS,
4277
SCH_COLLATIONS,
4090
4278
SCH_COLLATION_CHARACTER_SET_APPLICABILITY,
4091
4279
SCH_COLUMNS,
4092
4280
SCH_COLUMN_PRIVILEGES,
4094
4282
SCH_KEY_COLUMN_USAGE,
4095
4283
SCH_OPEN_TABLES,
4096
4284
SCH_PROFILES,
4097
@@ -387,8 +388,10 @@
4285
@@ -387,8 +389,10 @@
4098
4286
SCH_TABLE_CONSTRAINTS,
4099
4287
SCH_TABLE_NAMES,
4100
4288
SCH_TABLE_PRIVILEGES,
4105
4293
SCH_VARIABLES,
4106
4294
SCH_VIEWS
4107
4295
};
4108
diff -r 85ce661bd25c strings/Makefile.in
4109
--- a/strings/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4110
+++ b/strings/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4296
diff -r 592f6c3641ba strings/Makefile.in
4297
--- a/strings/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4298
+++ b/strings/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4111
4299
@@ -342,6 +342,7 @@
4112
4300
LIBDL = @LIBDL@
4113
4301
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4116
4304
LIBS = @LIBS@
4117
4305
LIBTOOL = @LIBTOOL@
4118
4306
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4119
diff -r 85ce661bd25c support-files/MacOSX/Makefile.in
4120
--- a/support-files/MacOSX/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4121
+++ b/support-files/MacOSX/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4307
diff -r 592f6c3641ba support-files/MacOSX/Makefile.in
4308
--- a/support-files/MacOSX/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4309
+++ b/support-files/MacOSX/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4122
4310
@@ -148,6 +148,7 @@
4123
4311
LIBDL = @LIBDL@
4124
4312
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4127
4315
LIBS = @LIBS@
4128
4316
LIBTOOL = @LIBTOOL@
4129
4317
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4130
diff -r 85ce661bd25c support-files/Makefile.in
4131
--- a/support-files/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4132
+++ b/support-files/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4318
diff -r 592f6c3641ba support-files/Makefile.in
4319
--- a/support-files/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4320
+++ b/support-files/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4133
4321
@@ -171,6 +171,7 @@
4134
4322
LIBDL = @LIBDL@
4135
4323
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4138
4326
LIBS = @LIBS@
4139
4327
LIBTOOL = @LIBTOOL@
4140
4328
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4141
diff -r 85ce661bd25c support-files/RHEL4-SElinux/Makefile.in
4142
--- a/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4143
+++ b/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4329
diff -r 592f6c3641ba support-files/RHEL4-SElinux/Makefile.in
4330
--- a/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4331
+++ b/support-files/RHEL4-SElinux/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4144
4332
@@ -146,6 +146,7 @@
4145
4333
LIBDL = @LIBDL@
4146
4334
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4149
4337
LIBS = @LIBS@
4150
4338
LIBTOOL = @LIBTOOL@
4151
4339
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4152
diff -r 85ce661bd25c tests/Makefile.in
4153
--- a/tests/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4154
+++ b/tests/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4340
diff -r 592f6c3641ba tests/Makefile.in
4341
--- a/tests/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4342
+++ b/tests/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4155
4343
@@ -193,6 +193,7 @@
4156
4344
LIBDL = @LIBDL@
4157
4345
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4160
4348
LIBS = @CLIENT_LIBS@
4161
4349
LIBTOOL = @LIBTOOL@
4162
4350
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4163
diff -r 85ce661bd25c tools/Makefile.in
4164
--- a/tools/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4165
+++ b/tools/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4351
diff -r 592f6c3641ba tools/Makefile.in
4352
--- a/tools/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4353
+++ b/tools/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4166
4354
@@ -167,6 +167,7 @@
4167
4355
LIBDL = @LIBDL@
4168
4356
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4171
4359
LIBS = @LIBS@
4172
4360
LIBTOOL = @LIBTOOL@
4173
4361
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4174
diff -r 85ce661bd25c vio/Makefile.in
4175
--- a/vio/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4176
+++ b/vio/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4362
diff -r 592f6c3641ba vio/Makefile.in
4363
--- a/vio/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4364
+++ b/vio/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4177
4365
@@ -176,6 +176,7 @@
4178
4366
LIBDL = @LIBDL@
4179
4367
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4182
4370
LIBS = @LIBS@
4183
4371
LIBTOOL = @LIBTOOL@
4184
4372
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4185
diff -r 85ce661bd25c win/Makefile.in
4186
--- a/win/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4187
+++ b/win/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4373
diff -r 592f6c3641ba win/Makefile.in
4374
--- a/win/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4375
+++ b/win/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4188
4376
@@ -144,6 +144,7 @@
4189
4377
LIBDL = @LIBDL@
4190
4378
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
4193
4381
LIBS = @LIBS@
4194
4382
LIBTOOL = @LIBTOOL@
4195
4383
LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
4196
diff -r 85ce661bd25c zlib/Makefile.in
4197
--- a/zlib/Makefile.in Wed Jul 29 00:09:40 2009 -0700
4198
+++ b/zlib/Makefile.in Wed Jul 29 00:09:56 2009 -0700
4384
diff -r 592f6c3641ba zlib/Makefile.in
4385
--- a/zlib/Makefile.in Wed Jul 29 13:33:34 2009 -0700
4386
+++ b/zlib/Makefile.in Wed Jul 29 13:34:11 2009 -0700
4199
4387
@@ -187,6 +187,7 @@
4200
4388
LIBDL = @LIBDL@
4201
4389
LIBEDIT_LOBJECTS = @LIBEDIT_LOBJECTS@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1