Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1363370 into lp:percona-server/5.6

[Sergei Glushchenko]

1. Fix ids of 3 files
2. Automerge fix for bug 1363370

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/703/

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/705/

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/719/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'mysql-test/r/audit_log_rotate.result'
--- mysql-test/r/audit_log_rotate.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_rotate.result	2014-09-26 09:26:38 +0000
@@ -0,0 +1,1 @@
+success

=== added file 'mysql-test/t/audit_log_rotate-master.opt'
--- mysql-test/t/audit_log_rotate-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_rotate-master.opt	2014-09-26 09:26:38 +0000
@@ -0,0 +1,8 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_file=test_audit.log
+--audit_log_format=JSON
+--audit_log_strategy=ASYNCHRONOUS
+--audit_log_rotate_on_size=4096
+--audit_log_buffer_size=5000
+--audit_log_rotations=10

=== added file 'mysql-test/t/audit_log_rotate.test'
--- mysql-test/t/audit_log_rotate.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_rotate.test	2014-09-26 09:26:38 +0000
@@ -0,0 +1,29 @@
+--source include/not_embedded.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
+
+--disable_result_log
+--disable_query_log
+--source include/audit_log_events.inc
+--source include/audit_log_events.inc
+--source include/audit_log_events.inc
+--source include/audit_log_events.inc
+--enable_query_log
+--enable_result_log
+
+perl;
+  eval "use JSON qw(decode_json); 1" or exit 0;
+  my @files = glob ($ENV{'MYSQLD_DATADIR'} . "/test_audit.log.*");
+  foreach (@files) {
+    open my $file, $_ or die "Could not open log: $!";
+    while (my $line = <$file>) {
+        decode_json($line);
+    }
+    close $file;
+  }
+  die "Rotation doesn't wrok!" unless scalar(@files) > 1
+EOF
+--remove_files_wildcard $MYSQLD_DATADIR test_audit.log*
+
+--echo success

=== added file 'plugin/audit_log/audit_file.c'
--- plugin/audit_log/audit_file.c	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_file.c	2014-09-26 09:26:38 +0000
@@ -0,0 +1,204 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include "audit_handler.h"
+#include "buffer.h"
+
+typedef struct audit_handler_file_data_struct audit_handler_file_data_t;
+
+struct audit_handler_file_data_struct
+{
+  size_t struct_size;
+  LOGGER_HANDLE *logger;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+  my_bool sync_on_write;
+  my_bool use_buffer;
+  audit_log_buffer_t *buffer;
+};
+
+static
+int audit_handler_file_write(audit_handler_t *handler,
+                             const char *buf, size_t len);
+static
+int audit_handler_file_flush(audit_handler_t *handler);
+static
+int audit_handler_file_close(audit_handler_t *handler);
+static
+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
+                                   const char *buf, size_t len,
+                                   log_record_state_t state);
+static
+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
+                                 const char *buf, size_t len);
+static
+void audit_handler_file_set_option(audit_handler_t *handler,
+                                   audit_handler_option_t opt, void *val);
+
+static
+int write_callback(void *data, const char *buf, size_t len,
+                   log_record_state_t state)
+{
+  audit_handler_t *handler= (audit_handler_t *) data;
+  audit_handler_file_data_t *hdata= (audit_handler_file_data_t*) handler->data;
+
+  DBUG_ASSERT(hdata->struct_size == sizeof(audit_handler_file_data_t));
+
+  return audit_handler_file_write_nobuf(hdata->logger, buf, len, state);
+}
+
+
+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts)
+{
+  audit_handler_t *handler= (audit_handler_t*)
+         calloc(sizeof(audit_handler_t) + sizeof(audit_handler_file_data_t), 1);
+  if (handler != NULL)
+  {
+    audit_handler_file_data_t *data= (audit_handler_file_data_t*) (handler + 1);
+    data->struct_size= sizeof(audit_handler_file_data_t);
+    data->footer= opts->footer;
+    data->header= opts->header;
+    data->sync_on_write= opts->sync_on_write;
+    data->use_buffer= opts->use_buffer;
+    if (data->use_buffer)
+    {
+      data->buffer= audit_log_buffer_init(opts->buffer_size,
+                                       opts->can_drop_data,
+                                       write_callback, handler);
+      if (data->buffer == NULL)
+        goto error;
+    }
+    data->logger= logger_open(opts->name, opts->rotate_on_size,
+                              opts->rotate_on_size ? opts->rotations : 0,
+                              !opts->use_buffer, opts->header);
+    if (data->logger == NULL)
+    {
+      goto error;
+    }
+    handler->data= data;
+    handler->write= audit_handler_file_write;
+    handler->flush= audit_handler_file_flush;
+    handler->close= audit_handler_file_close;
+    handler->set_option= audit_handler_file_set_option;
+    goto success;
+error:
+    if (data->use_buffer)
+    {
+      free(data->buffer);
+    }
+    free(handler);
+    handler= NULL;
+  }
+success:
+  return handler;
+}
+
+static
+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
+                                   const char *buf, size_t len,
+                                   log_record_state_t state)
+{
+  return logger_write(logger, buf, len, state);
+}
+
+static
+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
+                                 const char *buf, size_t len)
+{
+  return audit_log_buffer_write(buffer, buf, len);
+}
+
+static
+int audit_handler_file_write(audit_handler_t *handler,
+                             const char *buf, size_t len)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  int res;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  if (data->use_buffer)
+  {
+    DBUG_ASSERT(data->buffer);
+    res= audit_handler_file_write_buf(data->buffer, buf, len);
+  }
+  else
+  {
+    DBUG_ASSERT(data->logger);
+    res= audit_handler_file_write_nobuf(data->logger, buf, len,
+                                        LOG_RECORD_COMPLETE);
+
+    if (data->sync_on_write)
+    {
+      logger_sync(data->logger);
+    }
+  }
+
+  return res;
+}
+
+static
+int audit_handler_file_flush(audit_handler_t *handler)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  LOGGER_HANDLE* logger;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  logger= data->logger;
+
+  return logger_reopen(logger, data->header, data->footer);
+}
+
+static
+int audit_handler_file_close(audit_handler_t *handler)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  int res;
+  LOGGER_HANDLE* logger;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  logger= data->logger;
+
+  if (data->use_buffer)
+  {
+    audit_log_buffer_shutdown(data->buffer);
+  }
+
+  res= logger_close(logger, data->footer);
+
+  free(handler);
+
+  return res;
+}
+
+static
+void audit_handler_file_set_option(audit_handler_t *handler,
+                                   audit_handler_option_t opt, void *val)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+
+  switch (opt)
+  {
+  case OPT_ROTATIONS:
+    logger_set_size_limit(data->logger, *(ulonglong*)(val));
+    break;
+  case OPT_ROTATE_ON_SIZE:
+    logger_set_rotations(data->logger, *(ulonglong*)(val));
+    break;
+  }
+}

=== removed file 'plugin/audit_log/audit_file.c'
--- plugin/audit_log/audit_file.c	2014-07-30 16:48:53 +0000
+++ plugin/audit_log/audit_file.c	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-#include "audit_handler.h"
-#include "buffer.h"
-
-typedef struct audit_handler_file_data_struct audit_handler_file_data_t;
-
-struct audit_handler_file_data_struct
-{
-  size_t struct_size;
-  LOGGER_HANDLE *logger;
-  logger_prolog_func_t header;
-  logger_epilog_func_t footer;
-  my_bool sync_on_write;
-  my_bool use_buffer;
-  audit_log_buffer_t *buffer;
-};
-
-static
-int audit_handler_file_write(audit_handler_t *handler,
-                             const char *buf, size_t len);
-static
-int audit_handler_file_flush(audit_handler_t *handler);
-static
-int audit_handler_file_close(audit_handler_t *handler);
-static
-int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
-                                   const char *buf, size_t len);
-static
-int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
-                                 const char *buf, size_t len);
-static
-void audit_handler_file_set_option(audit_handler_t *handler,
-                                   audit_handler_option_t opt, void *val);
-
-static
-int write_callback(void *data, const char *buf, size_t len)
-{
-  audit_handler_t *handler= (audit_handler_t *) data;
-  audit_handler_file_data_t *hdata= (audit_handler_file_data_t*) handler->data;
-
-  DBUG_ASSERT(hdata->struct_size == sizeof(audit_handler_file_data_t));
-
-  return audit_handler_file_write_nobuf(hdata->logger, buf, len);
-}
-
-
-audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts)
-{
-  audit_handler_t *handler= (audit_handler_t*)
-         calloc(sizeof(audit_handler_t) + sizeof(audit_handler_file_data_t), 1);
-  if (handler != NULL)
-  {
-    audit_handler_file_data_t *data= (audit_handler_file_data_t*) (handler + 1);
-    data->struct_size= sizeof(audit_handler_file_data_t);
-    data->footer= opts->footer;
-    data->header= opts->header;
-    data->sync_on_write= opts->sync_on_write;
-    data->use_buffer= opts->use_buffer;
-    if (data->use_buffer)
-    {
-      data->buffer= audit_log_buffer_init(opts->buffer_size,
-                                       opts->can_drop_data,
-                                       write_callback, handler);
-      if (data->buffer == NULL)
-        goto error;
-    }
-    data->logger= logger_open(opts->name, opts->rotate_on_size,
-                              opts->rotate_on_size ? opts->rotations : 0,
-                              !opts->use_buffer, opts->header);
-    if (data->logger == NULL)
-    {
-      goto error;
-    }
-    handler->data= data;
-    handler->write= audit_handler_file_write;
-    handler->flush= audit_handler_file_flush;
-    handler->close= audit_handler_file_close;
-    handler->set_option= audit_handler_file_set_option;
-    goto success;
-error:
-    if (data->use_buffer)
-    {
-      free(data->buffer);
-    }
-    free(handler);
-    handler= NULL;
-  }
-success:
-  return handler;
-}
-
-static
-int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
-                                   const char *buf, size_t len)
-{
-  return logger_write(logger, buf, len);
-}
-
-static
-int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
-                                 const char *buf, size_t len)
-{
-  return audit_log_buffer_write(buffer, buf, len);
-}
-
-static
-int audit_handler_file_write(audit_handler_t *handler,
-                             const char *buf, size_t len)
-{
-  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
-  int res;
-
-  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
-
-  if (data->use_buffer)
-  {
-    DBUG_ASSERT(data->buffer);
-    res= audit_handler_file_write_buf(data->buffer, buf, len);
-  }
-  else
-  {
-    DBUG_ASSERT(data->logger);
-    res= audit_handler_file_write_nobuf(data->logger, buf, len);
-
-    if (data->sync_on_write)
-    {
-      logger_sync(data->logger);
-    }
-  }
-
-  return res;
-}
-
-static
-int audit_handler_file_flush(audit_handler_t *handler)
-{
-  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
-  LOGGER_HANDLE* logger;
-
-  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
-
-  logger= data->logger;
-
-  return logger_reopen(logger, data->header, data->footer);
-}
-
-static
-int audit_handler_file_close(audit_handler_t *handler)
-{
-  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
-  int res;
-  LOGGER_HANDLE* logger;
-
-  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
-
-  logger= data->logger;
-
-  if (data->use_buffer)
-  {
-    audit_log_buffer_shutdown(data->buffer);
-  }
-
-  res= logger_close(logger, data->footer);
-
-  free(handler);
-
-  return res;
-}
-
-static
-void audit_handler_file_set_option(audit_handler_t *handler,
-                                   audit_handler_option_t opt, void *val)
-{
-  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
-
-  switch (opt)
-  {
-  case OPT_ROTATIONS:
-    logger_set_size_limit(data->logger, *(ulonglong*)(val));
-    break;
-  case OPT_ROTATE_ON_SIZE:
-    logger_set_rotations(data->logger, *(ulonglong*)(val));
-    break;
-  }
-}

=== added file 'plugin/audit_log/audit_handler.h'
--- plugin/audit_log/audit_handler.h	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_handler.h	2014-09-26 09:26:38 +0000
@@ -0,0 +1,116 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+
+#ifndef AUDIT_HANDLER_INCLUDED
+#define AUDIT_HANDLER_INCLUDED
+
+#include <my_global.h>
+
+#include "logger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct audit_handler_struct audit_handler_t;
+typedef struct audit_handler_file_config_struct audit_handler_file_config_t;
+typedef struct audit_handler_syslog_config_struct audit_handler_syslog_config_t;
+typedef struct audit_handler_buffered_struct audit_handler_buffered_t;
+typedef void * audit_handler_data_t;
+
+
+typedef enum { OPT_ROTATE_ON_SIZE, OPT_ROTATIONS } audit_handler_option_t;
+
+struct audit_handler_struct
+{
+  int (*write)(audit_handler_t *, const char *, size_t);
+  int (*flush)(audit_handler_t *);
+  int (*close)(audit_handler_t *);
+  void (*set_option)(audit_handler_t *, audit_handler_option_t, void *);
+  audit_handler_data_t data;
+};
+
+struct audit_handler_file_config_struct
+{
+  const char *name;
+  size_t rotate_on_size;
+  size_t rotations;
+  my_bool sync_on_write;
+  my_bool use_buffer;
+  size_t buffer_size;
+  my_bool can_drop_data;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+struct audit_handler_syslog_config_struct
+{
+  const char *ident;
+  int facility;
+  int priority;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+static inline
+int audit_handler_write(audit_handler_t *handler, const char *buf, size_t len)
+{
+  if (handler->write != NULL)
+  {
+    return handler->write(handler, buf, len);
+  }
+  return len;
+}
+
+static inline
+int audit_handler_flush(audit_handler_t *handler)
+{
+  if (handler->flush != NULL)
+  {
+    return handler->flush(handler);
+  }
+  return 0;
+}
+
+static inline
+int audit_handler_close(audit_handler_t *handler)
+{
+  if (handler->close != NULL)
+  {
+    return handler->close(handler);
+  }
+  return 0;
+}
+
+static inline
+void audit_handler_set_option(audit_handler_t *handler,
+                              audit_handler_option_t opt, void *val)
+{
+  if (handler->set_option != NULL)
+  {
+    handler->set_option(handler, opt, val);
+  }
+}
+
+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts);
+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== removed file 'plugin/audit_log/audit_handler.h'
--- plugin/audit_log/audit_handler.h	2014-07-30 16:48:53 +0000
+++ plugin/audit_log/audit_handler.h	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-
-#ifndef AUDIT_HANDLER_INCLUDED
-#define AUDIT_HANDLER_INCLUDED
-
-#include <my_global.h>
-
-#include "logger.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct audit_handler_struct audit_handler_t;
-typedef struct audit_handler_file_config_struct audit_handler_file_config_t;
-typedef struct audit_handler_syslog_config_struct audit_handler_syslog_config_t;
-typedef struct audit_handler_buffered_struct audit_handler_buffered_t;
-typedef void * audit_handler_data_t;
-
-
-typedef enum { OPT_ROTATE_ON_SIZE, OPT_ROTATIONS } audit_handler_option_t;
-
-struct audit_handler_struct
-{
-  int (*write)(audit_handler_t *, const char *, size_t);
-  int (*flush)(audit_handler_t *);
-  int (*close)(audit_handler_t *);
-  void (*set_option)(audit_handler_t *, audit_handler_option_t, void *);
-  audit_handler_data_t data;
-};
-
-struct audit_handler_file_config_struct
-{
-  const char *name;
-  size_t rotate_on_size;
-  size_t rotations;
-  my_bool sync_on_write;
-  my_bool use_buffer;
-  size_t buffer_size;
-  my_bool can_drop_data;
-  logger_prolog_func_t header;
-  logger_epilog_func_t footer;
-};
-
-struct audit_handler_syslog_config_struct
-{
-  const char *ident;
-  int facility;
-  int priority;
-  logger_prolog_func_t header;
-  logger_epilog_func_t footer;
-};
-
-static inline
-int audit_handler_write(audit_handler_t *handler, const char *buf, size_t len)
-{
-  if (handler->write != NULL)
-  {
-    return handler->write(handler, buf, len);
-  }
-  return len;
-}
-
-static inline
-int audit_handler_flush(audit_handler_t *handler)
-{
-  if (handler->flush != NULL)
-  {
-    return handler->flush(handler);
-  }
-  return 0;
-}
-
-static inline
-int audit_handler_close(audit_handler_t *handler)
-{
-  if (handler->close != NULL)
-  {
-    return handler->close(handler);
-  }
-  return 0;
-}
-
-static inline
-void audit_handler_set_option(audit_handler_t *handler,
-                              audit_handler_option_t opt, void *val)
-{
-  if (handler->set_option != NULL)
-  {
-    handler->set_option(handler, opt, val);
-  }
-}
-
-audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts);
-audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

=== added file 'plugin/audit_log/audit_syslog.c'
--- plugin/audit_log/audit_syslog.c	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_syslog.c	2014-09-26 09:26:38 +0000
@@ -0,0 +1,91 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include <syslog.h>
+#include <string.h>
+#include "audit_handler.h"
+
+typedef struct audit_handler_syslog_data_struct audit_handler_syslog_data_t;
+
+struct audit_handler_syslog_data_struct
+{
+  size_t struct_size;
+  int priority;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+int audit_handler_syslog_write(audit_handler_t *handler,
+                               const char *buf, size_t len);
+int audit_handler_syslog_flush(audit_handler_t *handler);
+int audit_handler_syslog_close(audit_handler_t *handler);
+
+
+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts)
+{
+  audit_handler_t *handler= (audit_handler_t*)
+       calloc(sizeof(audit_handler_t) + sizeof(audit_handler_syslog_data_t), 1);
+  if (handler != NULL)
+  {
+    audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) (handler + 1);
+    MY_STAT stat_arg;
+
+    data->struct_size= sizeof(audit_handler_syslog_data_t);
+    data->priority= opts->priority;
+    data->header= opts->header;
+    data->footer= opts->footer;
+    openlog(opts->ident, 0, opts->facility);
+    memset(&stat_arg, 0, sizeof(stat_arg));
+    opts->header(&stat_arg, NULL, 0);
+    handler->data= data;
+    handler->write= audit_handler_syslog_write;
+    handler->flush= audit_handler_syslog_flush;
+    handler->close= audit_handler_syslog_close;
+  }
+  return handler;
+}
+
+int audit_handler_syslog_write(audit_handler_t *handler,
+                               const char *buf, size_t len)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_syslog_data_t));
+  syslog(data->priority, "%s", buf);
+  return len;
+}
+
+int audit_handler_syslog_flush(audit_handler_t *handler)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  MY_STAT stat_arg;
+  memset(&stat_arg, 0, sizeof(stat_arg));
+  data->header(&stat_arg, NULL, 0);
+  data->footer(NULL, 0);
+  return 0;
+}
+
+int audit_handler_syslog_close(audit_handler_t *handler)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  data->footer(NULL, 0);
+  closelog();
+  free(handler);
+  return 0;
+}

=== removed file 'plugin/audit_log/audit_syslog.c'
--- plugin/audit_log/audit_syslog.c	2014-07-30 16:48:53 +0000
+++ plugin/audit_log/audit_syslog.c	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-#include <syslog.h>
-#include <string.h>
-#include "audit_handler.h"
-
-typedef struct audit_handler_syslog_data_struct audit_handler_syslog_data_t;
-
-struct audit_handler_syslog_data_struct
-{
-  size_t struct_size;
-  int priority;
-  logger_prolog_func_t header;
-  logger_epilog_func_t footer;
-};
-
-int audit_handler_syslog_write(audit_handler_t *handler,
-                               const char *buf, size_t len);
-int audit_handler_syslog_flush(audit_handler_t *handler);
-int audit_handler_syslog_close(audit_handler_t *handler);
-
-
-audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts)
-{
-  audit_handler_t *handler= (audit_handler_t*)
-       calloc(sizeof(audit_handler_t) + sizeof(audit_handler_syslog_data_t), 1);
-  if (handler != NULL)
-  {
-    audit_handler_syslog_data_t *data=
-                                   (audit_handler_syslog_data_t*) (handler + 1);
-    MY_STAT stat_arg;
-
-    data->struct_size= sizeof(audit_handler_syslog_data_t);
-    data->priority= opts->priority;
-    data->header= opts->header;
-    data->footer= opts->footer;
-    openlog(opts->ident, 0, opts->facility);
-    memset(&stat_arg, 0, sizeof(stat_arg));
-    opts->header(&stat_arg, NULL, 0);
-    handler->data= data;
-    handler->write= audit_handler_syslog_write;
-    handler->flush= audit_handler_syslog_flush;
-    handler->close= audit_handler_syslog_close;
-  }
-  return handler;
-}
-
-int audit_handler_syslog_write(audit_handler_t *handler,
-                               const char *buf, size_t len)
-{
-  audit_handler_syslog_data_t *data=
-                                   (audit_handler_syslog_data_t*) handler->data;
-  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_syslog_data_t));
-  syslog(data->priority, "%s", buf);
-  return len;
-}
-
-int audit_handler_syslog_flush(audit_handler_t *handler)
-{
-  audit_handler_syslog_data_t *data=
-                                   (audit_handler_syslog_data_t*) handler->data;
-  MY_STAT stat_arg;
-  memset(&stat_arg, 0, sizeof(stat_arg));
-  data->header(&stat_arg, NULL, 0);
-  data->footer(NULL, 0);
-  return 0;
-}
-
-int audit_handler_syslog_close(audit_handler_t *handler)
-{
-  audit_handler_syslog_data_t *data=
-                                   (audit_handler_syslog_data_t*) handler->data;
-  data->footer(NULL, 0);
-  closelog();
-  free(handler);
-  return 0;
-}

=== modified file 'plugin/audit_log/buffer.c'
--- plugin/audit_log/buffer.c	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/buffer.c	2014-09-26 09:26:38 +0000
@@ -73,26 +73,25 @@
     mysql_mutex_unlock(&log->mutex);
     log->write_func(log->write_func_data,
                     log->buf + log->flush_pos,
-                    log->size - log->flush_pos);
+                    log->size - log->flush_pos,
+                    LOG_RECORD_INCOMPLETE);
     mysql_mutex_lock(&log->mutex);
     log->flush_pos= 0;
     log->write_pos%= log->size;
-    DBUG_ASSERT(log->write_pos >= log->flush_pos);
-    mysql_cond_broadcast(&log->flushed_cond);
-    mysql_mutex_unlock(&log->mutex);
   }
   else
   {
     size_t flushlen= log->write_pos - log->flush_pos;
     mysql_mutex_unlock(&log->mutex);
     log->write_func(log->write_func_data,
-                    log->buf + log->flush_pos, flushlen);
+                    log->buf + log->flush_pos, flushlen,
+                    LOG_RECORD_COMPLETE);
     mysql_mutex_lock(&log->mutex);
     log->flush_pos+= flushlen;
-    DBUG_ASSERT(log->write_pos >= log->flush_pos);
-    mysql_cond_broadcast(&log->flushed_cond);
-    mysql_mutex_unlock(&log->mutex);
   }
+  DBUG_ASSERT(log->write_pos >= log->flush_pos);
+  mysql_cond_broadcast(&log->flushed_cond);
+  mysql_mutex_unlock(&log->mutex);
 }
 
 

=== modified file 'plugin/audit_log/buffer.h'
--- plugin/audit_log/buffer.h	2014-08-22 13:31:49 +0000
+++ plugin/audit_log/buffer.h	2014-09-26 09:26:38 +0000
@@ -19,6 +19,7 @@
 #define AUDIT_LOG_BUFFER_INCLUDED
 
 #include <string.h> // for size_t
+#include "logger.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,7 +27,8 @@
 
 typedef struct audit_log_buffer audit_log_buffer_t;
 
-typedef int (*audit_log_write_func)(void *data, const char *buf, size_t len);
+typedef int (*audit_log_write_func)(void *data, const char *buf, size_t len,
+                                    log_record_state_t state);
 
 audit_log_buffer_t *audit_log_buffer_init(size_t size, int drop_if_full,
                                  audit_log_write_func write_func, void *data);

=== modified file 'plugin/audit_log/file_logger.c'
--- plugin/audit_log/file_logger.c	2014-07-30 17:12:20 +0000
+++ plugin/audit_log/file_logger.c	2014-09-26 09:26:38 +0000
@@ -279,24 +279,28 @@
 }
 
 
-int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size)
+int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size,
+                 log_record_state_t state)
 {
   int result;
   my_off_t filesize;
 
   flogger_mutex_lock(log);
-  if (log->rotations > 0)
-    if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
-        ((unsigned long long)filesize >= log->size_limit &&
-         do_rotate(log)))
-    {
-      result= -1;
-      errno= my_errno;
-      goto exit; /* Log rotation needed but failed */
-    }
 
   result= my_write(log->file, (uchar *) buffer, size, MYF(0));
 
+  if (state == LOG_RECORD_COMPLETE && log->rotations > 0)
+  {
+    if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
+        ((unsigned long long)filesize >= log->size_limit &&
+         do_rotate(log)))
+    {
+      result= -1;
+      errno= my_errno;
+      goto exit; /* Log rotation needed but failed */
+    }
+  }
+
 exit:
   flogger_mutex_unlock(log);
   return result;

=== modified file 'plugin/audit_log/logger.h'
--- plugin/audit_log/logger.h	2014-08-22 13:31:49 +0000
+++ plugin/audit_log/logger.h	2014-09-26 09:26:38 +0000
@@ -62,6 +62,10 @@
 typedef struct logger_handle_st LOGGER_HANDLE;
 typedef size_t (*logger_prolog_func_t)(MY_STAT *, char *buf, size_t buflen);
 typedef size_t (*logger_epilog_func_t)(char *buf, size_t buflen);
+typedef enum {
+  LOG_RECORD_COMPLETE,
+  LOG_RECORD_INCOMPLETE
+} log_record_state_t;
 
 void logger_init_mutexes();
 LOGGER_HANDLE *logger_open(const char *path,
@@ -72,7 +76,8 @@
 int logger_close(LOGGER_HANDLE *log, logger_epilog_func_t footer);
 int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr);
 int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...);
-int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
+int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size,
+                 log_record_state_t state);
 int logger_rotate(LOGGER_HANDLE *log); 
 int logger_sync(LOGGER_HANDLE *log);
 int logger_reopen(LOGGER_HANDLE *log, logger_prolog_func_t header,