Percona patches

Merge lp:~percona-dev/percona-patches/5.0.77-bug-382778 into lp:~percona-dev/percona-patches/5.0.77

  1. 5.0.77-bug-382778
  2. Merge into 5.0.77
Proposed by Yasufumi Kinoshita
Status: Merged
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-patches/5.0.77-bug-382778
Merge into: lp:~percona-dev/percona-patches/5.0.77
Diff against target: None lines
To merge this branch: bzr merge lp:~percona-dev/percona-patches/5.0.77-bug-382778
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Review via email: mp+7092@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'microslow_innodb.patch'
2--- microslow_innodb.patch 2009-05-27 01:07:17 +0000
3+++ microslow_innodb.patch 2009-06-05 05:44:40 +0000
4@@ -6,7 +6,7 @@
5 #define GET_STR 9
6 #define GET_STR_ALLOC 10
7 -#define GET_DISABLED 11
8-+#define GET_DOUBLE 11
9++#define GET_MICROTIME 11
10 +#define GET_DISABLED 12
11
12 #define GET_ASK_ADDR 128
13@@ -864,12 +864,22 @@
14 diff -r 04958490fc6d mysys/my_getopt.c
15 --- a/mysys/my_getopt.c Tue Feb 17 22:32:27 2009 -0800
16 +++ b/mysys/my_getopt.c Tue Feb 17 22:33:00 2009 -0800
17+@@ -827,7 +827,8 @@
18+ #endif
19+ break;
20+ default:
21+- DBUG_ASSERT((optp->var_type & GET_TYPE_MASK) == GET_ULL);
22++ DBUG_ASSERT((optp->var_type & GET_TYPE_MASK) == GET_ULL
23++ || (optp->var_type & GET_TYPE_MASK) == GET_MICROTIME);
24+ break;
25+ }
26+
27 @@ -1061,6 +1061,9 @@
28 case GET_ULONG:
29 printf("%lu\n", *((ulong*) value));
30 break;
31-+ case GET_DOUBLE:
32-+ printf("%6f\n", *((double*) value));
33++ case GET_MICROTIME:
34++ printf("%6f\n", ((double)(*((longlong*) value))) / 1000000.0);
35 + break;
36 case GET_LL:
37 printf("%s\n", llstr(*((longlong*) value), buff));
38@@ -1473,7 +1483,7 @@
39 + {"long_query_time", OPT_LONG_QUERY_TIME,
40 + "Log all queries that have taken more than long_query_time seconds to execute to file.",
41 + (gptr*) &global_system_variables.long_query_time,
42-+ (gptr*) &max_system_variables.long_query_time, 0, GET_DOUBLE,
43++ (gptr*) &max_system_variables.long_query_time, 0, GET_MICROTIME,
44 + REQUIRED_ARG, 10000000, 0, LONG_TIMEOUT * 1000000, 0, 1, 0},
45 + {"min_examined_row_limit", OPT_MIN_EXAMINED_ROW_LIMIT,
46 + "Don't log queries which examine less than min_examined_row_limit rows to file.",

Subscribers

People subscribed via source and target branches

to all changes: