Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1379023 into lp:percona-server/5.5

Proposed by Sergei Glushchenko on 2014-10-12
Status: Merged
Approved by: Laurynas Biveinis on 2014-10-12
Approved revision: 699
Merged at revision: 707
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-ps-bug1379023
Merge into: lp:percona-server/5.5
Diff against target: 23 lines (+2/-4)
1 file modified
plugin/audit_log/audit_log.c (+2/-4)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1379023
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-10-12 Approve on 2014-10-12
Review via email: mp+238070@code.launchpad.net

Description of the change

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/audit_log/audit_log.c'
2--- plugin/audit_log/audit_log.c 2014-07-30 19:36:26 +0000
3+++ plugin/audit_log/audit_log.c 2014-10-12 06:37:12 +0000
4@@ -420,7 +420,8 @@
5 make_record_id(id_str, sizeof(id_str)),
6 make_timestamp(timestamp, sizeof(timestamp), t),
7 event->general_sql_command.str,
8- event->general_thread_id, status,
9+ event->general_thread_id,
10+ status,
11 escape_string(event->general_query,
12 event->general_query_length,
13 query, sizeof(query), NULL),
14@@ -517,9 +518,6 @@
15 escape_string(event->host,
16 event->host_length,
17 endptr, endtmp - endptr, &endptr),
18- escape_string(event->user,
19- event->user_length,
20- endptr, endtmp - endptr, &endptr),
21 escape_string(event->ip,
22 event->ip_length,
23 endptr, endtmp - endptr, &endptr),

Subscribers

People subscribed via source and target branches