Merge lp://qastaging/~daniel-nichter/drizzle/query-log-ts into lp://qastaging/~drizzle-trunk/drizzle/development
Proposed by
Daniel Nichter
| Status: | Merged |
|---|---|
| Approved by: | Mark Atwood |
| Approved revision: | 2421 |
| Merged at revision: | 2422 |
| Proposed branch: | lp://qastaging/~daniel-nichter/drizzle/query-log-ts |
| Merge into: | lp://qastaging/~drizzle-trunk/drizzle/development |
| Diff against target: |
385 lines (+64/-42) 8 files modified
plugin/query_log/docs/index.rst (+42/-18) plugin/query_log/file.cc (+2/-1) plugin/query_log/tests/check-query-log-attribute.pl (+1/-4) plugin/query_log/tests/r/check_query_log_attribute.result (+1/-1) plugin/query_log/tests/r/file.result (+14/-14) plugin/query_log/tests/r/thresholds.result (+2/-2) plugin/query_log/tests/samples/sample-event.log (+1/-1) plugin/query_log/tests/t/file.test (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~daniel-nichter/drizzle/query-log-ts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Merge Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Just changes to query_log plugin, primarily: make first line of events "start_ts=VALUE" instead of a special bare "VALUE". This makes it possible to match/parse all attributes with one pattern because they are now all of the form ATTRIBUTE=VALUE. Documented meta-format of query log file.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
