1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-9106 Audit plugin not working with MySQL 5.7.

Browse Source 
fixing Windows crash.
This commit is contained in:
Alexey Botchkov 2016-01-15 09:50:27 +04:00
parent fe4823d28e
commit 9c9d10b441
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
plugin/server_audit/server_audit.c
View File

@ -116,18 +116,41 @@ static char *default_home= (char *)".";
#define FLOGGER_SKIP_INCLUDES #define FLOGGER_SKIP_INCLUDES
#define my_open(A, B, C) loc_open(A, B) #define my_open(A, B, C) loc_open(A, B)
#define my_close(A, B) close(A) #define my_close(A, B) loc_close(A)
#define my_rename(A, B, C) loc_rename(A, B) #define my_rename(A, B, C) loc_rename(A, B)
#define my_tell(A, B) loc_tell(A) #define my_tell(A, B) loc_tell(A)
#define my_write(A, B, C, D) write(A, B, C) #define my_write(A, B, C, D) loc_write(A, B, C)
#define my_malloc(A, B) malloc(A) #define my_malloc(A, B) malloc(A)
#define my_free(A) free(A) #define my_free(A) free(A)
#ifdef my_errno
#undef my_errno
#endif
static int loc_file_errno;
#define my_errno loc_file_errno
#ifdef my_vsnprintf #ifdef my_vsnprintf
#undef my_vsnprintf #undef my_vsnprintf
#endif #endif
#define my_vsnprintf vsnprintf #define my_vsnprintf vsnprintf
#define logger_open loc_logger_open
#define logger_close loc_logger_close
#define logger_write loc_logger_write
#define logger_rotate loc_logger_rotate
#define logger_init_mutexts loc_logger_init_mutexts
File loc_open(const char *FileName, int Flags)
static size_t loc_write(File Filedes, const uchar *Buffer, size_t Count)
{
size_t writtenbytes;
#ifdef _WIN32
writtenbytes= my_win_write(Filedes, Buffer, Count);
#else
writtenbytes= write(Filedes, Buffer, Count);
#endif
return writtenbytes;
}
static File loc_open(const char *FileName, int Flags)
/* Path-name of file */ /* Path-name of file */
/* Read | write .. */ /* Read | write .. */
/* Special flags */ /* Special flags */
@ -140,9 +163,27 @@ File loc_open(const char *FileName, int Flags)
#else #else
fd = open((char *) FileName, Flags); fd = open((char *) FileName, Flags);
#endif #endif
my_errno= errno;
return fd; return fd;
} }
static int loc_close(File fd)
{
int err;
#ifndef _WIN32
do
{
err= close(fd);
} while (err == -1 && errno == EINTR);
#else
err= my_win_close(fd);
#endif
my_errno=errno;
return err;
}
static int loc_rename(const char *from, const char *to) static int loc_rename(const char *from, const char *to)
{ {
int error = 0; int error = 0;