diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
| commit | d23bd26bec787ebbdbd41be0204e9cb83baf4dbd (patch) | |
| tree | dda05b0ebb3858e913b0ca3b864705e989bb7661 /mysys/file_logger.c | |
| parent | b83de1151aab6dcc9f300159e31198364000de70 (diff) | |
| parent | a9a08b1e2f5b7a9e3ab7c7f75c768389b1d8238f (diff) | |
| download | mariadb-git-d23bd26bec787ebbdbd41be0204e9cb83baf4dbd.tar.gz | |
Merge tag 'mariadb-5.5.48' into 5.5-galera
Diffstat (limited to 'mysys/file_logger.c')
| -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) |