database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-6124 Audit plugin fails with the Percona-Server 5.6.

Browse Source 
Some lines of code in file_logger.c were lost while moving to the
   general MariaDB tree. Adding them.
This commit is contained in:
Alexey Botchkov
2014-04-17 02:12:08 +05:00
parent 142c20eda9
commit ed899ec8f2
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysys/file_logger.c
View File

@@ -20,6 +20,13 @@
#include <mysql/service_logger.h> #include <mysql/service_logger.h>
#include <my_pthread.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 #ifdef HAVE_PSI_INTERFACE
/* These belong to the service initialization */ /* These belong to the service initialization */
static PSI_mutex_key key_LOCK_logger_service; static PSI_mutex_key key_LOCK_logger_service;
@@ -82,7 +89,8 @@ LOGGER_HANDLE *logger_open(const char *path,
return 0; /* End of memory */ return 0; /* End of memory */
} }
*l_perm= new_log; *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; return l_perm;
} }
@@ -90,7 +98,7 @@ int logger_close(LOGGER_HANDLE *log)
{ {
int result; int result;
File file= log->file; File file= log->file;
mysql_mutex_destroy(&log->lock); flogger_mutex_destroy(&log->lock);
my_free(log); my_free(log);
if ((result= my_close(file, MYF(0)))) if ((result= my_close(file, MYF(0))))
errno= my_errno; errno= my_errno;
@@ -147,7 +155,7 @@ int logger_vprintf(LOGGER_HANDLE *log, const char* fmt, va_list ap)
char cvtbuf[1024]; char cvtbuf[1024];
size_t n_bytes; size_t n_bytes;
mysql_mutex_lock(&log->lock); flogger_mutex_lock(&log->lock);
if (log->rotations > 0) if (log->rotations > 0)
if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 || if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
((unsigned long long)filesize >= log->size_limit && ((unsigned long long)filesize >= log->size_limit &&
@@ -165,7 +173,7 @@ int logger_vprintf(LOGGER_HANDLE *log, const char* fmt, va_list ap)
result= my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0)); result= my_write(log->file, (uchar *) cvtbuf, n_bytes, MYF(0));
exit: exit:
mysql_mutex_unlock(&log->lock); flogger_mutex_unlock(&log->lock);
return result; return result;
} }
@@ -175,7 +183,7 @@ int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size)
int result; int result;
my_off_t filesize; my_off_t filesize;
mysql_mutex_lock(&log->lock); flogger_mutex_lock(&log->lock);
if (log->rotations > 0) if (log->rotations > 0)
if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 || if ((filesize= my_tell(log->file, MYF(0))) == (my_off_t) -1 ||
((unsigned long long)filesize >= log->size_limit && ((unsigned long long)filesize >= log->size_limit &&
@@ -189,7 +197,7 @@ int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size)
result= my_write(log->file, (uchar *) buffer, size, MYF(0)); result= my_write(log->file, (uchar *) buffer, size, MYF(0));
exit: exit:
mysql_mutex_unlock(&log->lock); flogger_mutex_unlock(&log->lock);
return result; return result;
} }
@@ -197,9 +205,9 @@ exit:
int logger_rotate(LOGGER_HANDLE *log) int logger_rotate(LOGGER_HANDLE *log)
{ {
int result; int result;
mysql_mutex_lock(&log->lock); flogger_mutex_lock(&log->lock);
result= do_rotate(log); result= do_rotate(log);
mysql_mutex_unlock(&log->lock); flogger_mutex_unlock(&log->lock);
return result; return result;
} }

2
plugin/server_audit/server_audit.c
View File

@@ -15,7 +15,7 @@
#define PLUGIN_VERSION 0x101 #define PLUGIN_VERSION 0x101
#define PLUGIN_STR_VERSION "1.1.5" #define PLUGIN_STR_VERSION "1.1.7"
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>