Cleanup mman.h includes

As it is included from my_global.h already.

14 files changed, 0 insertions, 39 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 90f37f8ca81..61551d38337 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -964,8 +964,6 @@ extern ulonglong my_getcputime(void);
 #endif
 
 #ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-
 #ifndef MAP_NOSYNC
 #define MAP_NOSYNC      0
 #endif
diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c
index ce569b78c73..3ce0f07af58 100644
--- a/mysys/my_lockmem.c
+++ b/mysys/my_lockmem.c
@@ -20,7 +20,6 @@
 #include <my_list.h>
 
 #ifdef HAVE_MLOCK
-#include <sys/mman.h>
 
 struct st_mem_list
 {
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index fa10d4af3a1..bc804598cd5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -157,16 +157,11 @@ extern "C" {					// Because of SCO 3.2V4.2
 
 #include <my_libwrap.h>
 
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
 #ifdef __WIN__ 
 #include <crtdbg.h>
 #endif
 
 #ifdef HAVE_SOLARIS_LARGE_PAGES
-#include <sys/mman.h>
 #if defined(__sun__) && defined(__GNUC__) && defined(__cplusplus) \
     && defined(_XOPEN_SOURCE)
 extern int getpagesizes(size_t *, int);
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 70525725689..3842b7c4dc1 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -329,9 +329,6 @@ TODO list:
 */
 
 #include "mariadb.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
-#if defined(DBUG_OFF) && defined(HAVE_MADVISE)
-#include <sys/mman.h>
-#endif
 #include "sql_priv.h"
 #include "sql_basic_types.h"
 #include "sql_cache.h"
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index b1271ec85d1..19a03009ad5 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -92,7 +92,6 @@ support cross-platform development and expose comonly used SQL names. */
 #include <sys/stat.h>
 
 #ifndef _WIN32
-# include <sys/mman.h> /* mmap() for os0proc.cc */
 # include <sched.h>
 # include "my_config.h"
 #endif
diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h
index 46867a60023..a190b872549 100644
--- a/storage/innobase/include/ut0new.h
+++ b/storage/innobase/include/ut0new.h
@@ -129,9 +129,6 @@ InnoDB:
 #include <string.h> /* strlen(), strrchr(), strncmp() */
 
 #include "my_global.h" /* needed for headers from mysql/psi/ */
-#if !defined(DBUG_OFF) && defined(HAVE_MADVISE)
-#include <sys/mman.h>
-#endif
 
 /* JAN: TODO: missing 5.7 header */
 #ifdef HAVE_MYSQL_MEMORY_H
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index bfed6698428..eadac5b04eb 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -52,9 +52,6 @@
 #ifdef HAVE_SYS_VADVISE_H
 #include <sys/vadvise.h>
 #endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 /* Functions defined in this file */
 
diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c
index 2697c72f2b8..c2ac4d588a9 100644
--- a/storage/maria/ma_extra.c
+++ b/storage/maria/ma_extra.c
@@ -14,9 +14,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 #include "maria_def.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include "ma_blockrec.h"
 
 static void maria_extra_keyflag(MARIA_HA *info,
diff --git a/storage/maria/ma_packrec.c b/storage/maria/ma_packrec.c
index e2c1e353616..2e7add8f61d 100644
--- a/storage/maria/ma_packrec.c
+++ b/storage/maria/ma_packrec.c
@@ -1528,9 +1528,6 @@ static uint max_bit(register uint value)
 /*****************************************************************************
 	Some redefined functions to handle files when we are using memmap
 *****************************************************************************/
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 #ifdef HAVE_MMAP
 
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c
index 6ea40e65b29..85cdaa06701 100644
--- a/storage/maria/maria_chk.c
+++ b/storage/maria/maria_chk.c
@@ -23,9 +23,6 @@
 #include <my_getopt.h>
 #include <my_check_opt.h>
 #include <my_handler_errors.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 static uint decode_bits;
 static char **default_argv;
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 76accc0978e..eac50c4a04c 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -46,9 +46,6 @@
 #ifdef HAVE_SYS_VADVISE_H
 #include <sys/vadvise.h>
 #endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include "rt_index.h"
 #include <mysqld_error.h>
 
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index 27e08f093ff..07592ced5db 100644
--- a/storage/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.c
@@ -15,9 +15,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "myisamdef.h"
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 static void mi_extra_keyflag(MI_INFO *info, enum ha_extra_function function);
 
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index 72ce17b6a78..b28eaf21090 100644
--- a/storage/myisam/mi_packrec.c
+++ b/storage/myisam/mi_packrec.c
@@ -1479,9 +1479,6 @@ static uint max_bit(register uint value)
 /*****************************************************************************
 	Some redefined functions to handle files when we are using memmap
 *****************************************************************************/
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 #ifdef HAVE_MMAP
 
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index a3021ed72a7..f616a9f9b1a 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -21,9 +21,6 @@
 #include <stdarg.h>
 #include <my_getopt.h>
 #include <my_bit.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 
 static uint decode_bits;
 static char **default_argv;