HAVE_LARGE_PAGE_OPTION to HAVE_LARGE_PAGES

It isn't an "option" anymore.

cmake/os/SunOS.cmake

@@ -35,7 +35,7 @@ SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
 CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_DECL_MHA_MAPSIZE_VA)
 IF(HAVE_DECL_MHA_MAPSIZE_VA)
  SET(HAVE_SOLARIS_LARGE_PAGES 1)
- SET(HAVE_LARGE_PAGE_OPTION 1)
+ SET(HAVE_LARGE_PAGES 1)
 ENDIF()
 
 

cmake/os/Windows.cmake

@@ -281,7 +281,7 @@ ENDIF()
 
 SET(FN_NO_CASE_SENSE 1)
 SET(USE_SYMDIR 1)
-SET(HAVE_LARGE_PAGE_OPTION 1)
+SET(HAVE_LARGE_PAGES 1)
 
 # Force static C runtime for targets in current directory
 # (useful to get rid of MFC dll's dependency, or in installer)

config.h.cmake

@@ -164,7 +164,7 @@
 #cmakedefine gmtime_r @gmtime_r@
 #cmakedefine HAVE_IN_ADDR_T 1
 #cmakedefine HAVE_INITGROUPS 1
-#cmakedefine HAVE_LARGE_PAGE_OPTION 1
+#cmakedefine HAVE_LARGE_PAGES 1
 #cmakedefine HAVE_LDIV 1
 #cmakedefine HAVE_LRAND48 1
 #cmakedefine HAVE_LOCALTIME_R 1

configure.cmake

@@ -416,7 +416,7 @@ CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 
 IF(HAVE_MMAP)
-  SET(HAVE_LARGE_PAGE_OPTION 1)
+  SET(HAVE_LARGE_PAGES 1)
 ENDIF()
 
 IF(HAVE_SYS_EVENT_H)

include/my_sys.h

@@ -183,14 +183,14 @@ extern void my_get_large_page_size(void);
 #define my_get_large_page_size() do {} while(0)
 #endif
 
-#ifdef HAVE_LARGE_PAGE_OPTION
+#ifdef HAVE_LARGE_PAGES
 int my_init_large_pages(my_bool super_large_pages);
 uchar *my_large_malloc(size_t *size, myf my_flags);
 void my_large_free(void *ptr, size_t size);
 #else
 #define my_large_malloc(A, B) my_malloc_lock(*(A), (B))
 #define my_large_free(A, B) my_free_lock((A))
-#endif /* HAVE_LARGE_PAGE_OPTION */
+#endif /* HAVE_LARGE_PAGES */
 
 #ifdef _WIN32
 extern BOOL my_obtain_privilege(LPCSTR lpPrivilege);

mysys/CMakeLists.txt

@@ -66,7 +66,7 @@ IF(HAVE_ALARM)
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c)
 ENDIF()
 
-IF(HAVE_LARGE_PAGE_OPTION)
+IF(HAVE_LARGE_PAGES)
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c)
 ENDIF()
 

mysys/my_largepage.c

@@ -38,7 +38,7 @@ extern int memcntl(caddr_t, size_t, int, caddr_t, int, int);
 #endif /* __sun__ ... */
 #endif /* HAVE_SOLARIS_LARGE_PAGES */
 
-#ifdef HAVE_LARGE_PAGE_OPTION
+#ifdef HAVE_LARGE_PAGES
 static my_bool my_use_large_pages= 0;
 #else
 #define my_use_large_pages 0
@@ -58,7 +58,7 @@ static inline my_bool my_is_2pow(size_t n) { return !((n) & ((n) - 1)); }
 static uchar* my_large_malloc_int(size_t *size, myf my_flags);
 static my_bool my_large_free_int(void *ptr, size_t size);
 
-#ifdef HAVE_LARGE_PAGE_OPTION
+#ifdef HAVE_LARGE_PAGES
 
 #if defined(HAVE_GETPAGESIZES) || defined(__linux__)
 /* Descending sort */
@@ -226,7 +226,7 @@ void my_large_free(void *ptr, size_t size)
 
   DBUG_VOID_RETURN;
 }
-#endif /* HAVE_LARGE_PAGE_OPTION */
+#endif /* HAVE_LARGE_PAGES */
 
 
 #ifdef __linux__

sql/mysqld.cc

@@ -3937,7 +3937,7 @@ static int init_common_variables()
   DBUG_PRINT("info",("%s  Ver %s for %s on %s\n",my_progname,
 		     server_version, SYSTEM_TYPE,MACHINE_TYPE));
 
-#ifdef HAVE_LARGE_PAGE_OPTION
+#ifdef HAVE_LARGE_PAGES
   /* Initialize large page size */
   if (opt_large_pages)
   {
@@ -3952,7 +3952,7 @@ static int init_common_variables()
     This function must be called after my_init_large_pages.
   */
   my_get_large_page_size();
-#endif /* HAVE_LARGE_PAGE_OPTION */
+#endif /* HAVE_LARGE_PAGES */
 
 #if defined(HAVE_POOL_OF_THREADS)
   if (IS_SYSVAR_AUTOSIZE(&threadpool_size))