diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2016-01-25 16:37:08 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2016-01-25 16:37:08 +0400 |
| commit | 1793646d78dfd828ecf172bf6dc38def62a4361f (patch) | |
| tree | c5020df166e69b81c56ca1d5a91888d0d7b03f4c /mysys | |
| parent | 74b1af19e9270a932f9e5f907eff53852984a7d3 (diff) | |
| parent | 9c9d10b441fe79b111509949ca40afe1a6284c0f (diff) | |
| download | mariadb-git-1793646d78dfd828ecf172bf6dc38def62a4361f.tar.gz | |
Merge branch '5.5' into 10.0
Conflicts:
plugin/server_audit/server_audit.c
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/file_logger.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/file_logger.c b/mysys/file_logger.c index 394b59f6378..b94cb705d3f 100644 --- a/mysys/file_logger.c +++ b/mysys/file_logger.c @@ -14,11 +14,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef FLOGGER_SKIP_INCLUDES #include "my_global.h" #include <my_sys.h> #include <m_string.h> #include <mysql/service_logger.h> #include <my_pthread.h> +#endif /*FLOGGER_SKIP_INCLUDES*/ #ifndef flogger_mutex_init #define flogger_mutex_init(A,B,C) mysql_mutex_init(A,B,C) |