[Commits] Rev 4155: MDEV-6124 Audit plugin fails with the Percona-Server 5.6. in file:///home/hf/wmar/mdev-6124/

holyfoot at askmonty.org holyfoot at askmonty.org
Thu Apr 17 01:32:43 EEST 2014


At file:///home/hf/wmar/mdev-6124/

------------------------------------------------------------
revno: 4155
revision-id: holyfoot at askmonty.org-20140416211208-2qe8a3vn2f5atlmz
parent: holyfoot at askmonty.org-20140415154108-b2yk48au31g4k1l6
committer: Alexey Botchkov <holyfoot at askmonty.org>
branch nick: mdev-6124
timestamp: Thu 2014-04-17 02:12:08 +0500
message:
  MDEV-6124 Audit plugin fails with the Percona-Server 5.6.
     Some lines of code in file_logger.c were lost while moving to the
     general MariaDB tree. Adding them.
-------------- next part --------------
=== modified file 'mysys/file_logger.c'
--- a/mysys/file_logger.c	2014-02-17 10:09:57 +0000
+++ b/mysys/file_logger.c	2014-04-16 21:12:08 +0000
@@ -20,6 +20,13 @@
 #include <mysql/service_logger.h>
 #include <my_pthread.h>
 
+#ifndef flogger_mutex_init
+#define flogger_mutex_init(A,B,C) mysql_mutex_init(A,B,C)
+#define flogger_mutex_destroy(A) mysql_mutex_destroy(A)
+#define flogger_mutex_lock(A) mysql_mutex_lock(A)
+#define flogger_mutex_unlock(A) mysql_mutex_unlock(A)
+#endif /*flogger_mutex_init*/
+
 #ifdef HAVE_PSI_INTERFACE
 /* These belong to the service initialization */
 static PSI_mutex_key key_LOCK_logger_service;
@@ -82,7 +89,8 @@ LOGGER_HANDLE *logger_open(const char *p
     return 0; /* End of memory */
   }
   *l_perm= new_log;
-  mysql_mutex_init(key_LOCK_logger_service, &l_perm->lock, MY_MUTEX_INIT_FAST);
+  flogger_mutex_init(key_LOCK_logger_service, &l_perm->lock,
+                     MY_MUTEX_INIT_FAST);
   return l_perm;
 }
 
@@ -90,7 +98,7 @@ int logger_close(LOGGER_HANDLE *log)
 {
   int result;
   File file= log->file;
-  mysql_mutex_destroy(&log->lock);
+  flogger_mutex_destroy(&log->lock);
   my_free(log);
   if ((result= my_close(file, MYF(0))))
     errno= my_errno;
@@ -147,7 +155,7 @@ int logger_vprintf(LOGGER_HANDLE *log, c
   char cvtbuf[1024];
   size_t n_bytes;
 
-  mysql_mutex_lock(&log->lock);
+  flogger_mutex_lock(&log->lock);
   if (log->rotations > 0)
     if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
         ((unsigned long long)filesize >= log->size_limit &&
@@ -165,7 +173,7 @@ int logger_vprintf(LOGGER_HANDLE *log, c
   result= my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0));
 
 exit:
-  mysql_mutex_unlock(&log->lock);
+  flogger_mutex_unlock(&log->lock);
   return result;
 }
 
@@ -175,7 +183,7 @@ int logger_write(LOGGER_HANDLE *log, con
   int result;
   my_off_t filesize;
 
-  mysql_mutex_lock(&log->lock);
+  flogger_mutex_lock(&log->lock);
   if (log->rotations > 0)
     if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
         ((unsigned long long)filesize >= log->size_limit &&
@@ -189,7 +197,7 @@ int logger_write(LOGGER_HANDLE *log, con
   result= my_write(log->file, (uchar *) buffer, size, MYF(0));
 
 exit:
-  mysql_mutex_unlock(&log->lock);
+  flogger_mutex_unlock(&log->lock);
   return result;
 }
 
@@ -197,9 +205,9 @@ int logger_write(LOGGER_HANDLE *log, con
 int logger_rotate(LOGGER_HANDLE *log)
 {
   int result;
-  mysql_mutex_lock(&log->lock);
+  flogger_mutex_lock(&log->lock);
   result= do_rotate(log);
-  mysql_mutex_unlock(&log->lock);
+  flogger_mutex_unlock(&log->lock);
   return result;
 }
 

=== modified file 'plugin/server_audit/server_audit.c'
--- a/plugin/server_audit/server_audit.c	2014-03-23 14:44:48 +0000
+++ b/plugin/server_audit/server_audit.c	2014-04-16 21:12:08 +0000
@@ -15,7 +15,7 @@
 
 
 #define PLUGIN_VERSION 0x101
-#define PLUGIN_STR_VERSION "1.1.5"
+#define PLUGIN_STR_VERSION "1.1.7"
 
 #include <stdio.h>
 #include <time.h>



More information about the commits mailing list