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

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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) Approve
Review via email: mp+238070@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/audit_log/audit_log.c'
--- plugin/audit_log/audit_log.c 2014-07-30 19:36:26 +0000
+++ plugin/audit_log/audit_log.c 2014-10-12 06:37:12 +0000
@@ -420,7 +420,8 @@
420 make_record_id(id_str, sizeof(id_str)),420 make_record_id(id_str, sizeof(id_str)),
421 make_timestamp(timestamp, sizeof(timestamp), t),421 make_timestamp(timestamp, sizeof(timestamp), t),
422 event->general_sql_command.str,422 event->general_sql_command.str,
423 event->general_thread_id, status,423 event->general_thread_id,
424 status,
424 escape_string(event->general_query,425 escape_string(event->general_query,
425 event->general_query_length,426 event->general_query_length,
426 query, sizeof(query), NULL),427 query, sizeof(query), NULL),
@@ -517,9 +518,6 @@
517 escape_string(event->host,518 escape_string(event->host,
518 event->host_length,519 event->host_length,
519 endptr, endtmp - endptr, &endptr),520 endptr, endtmp - endptr, &endptr),
520 escape_string(event->user,
521 event->user_length,
522 endptr, endtmp - endptr, &endptr),
523 escape_string(event->ip,521 escape_string(event->ip,
524 event->ip_length,522 event->ip_length,
525 endptr, endtmp - endptr, &endptr),523 endptr, endtmp - endptr, &endptr),

Subscribers

People subscribed via source and target branches