Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
226852ea
Commit
226852ea
authored
Jul 19, 2010
by
sunanda.menon@sun.com
Committed by
MySQL Build Team
Jul 19, 2010
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.5.5-m3-release
parents
e0aba0c8
60a9dfbb
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
264 additions
and
81 deletions
+264
-81
CMakeLists.txt
CMakeLists.txt
+2
-2
cmake/build_configurations/mysql_release.cmake
cmake/build_configurations/mysql_release.cmake
+96
-45
cmake/cpack_source_ignore_files.cmake
cmake/cpack_source_ignore_files.cmake
+1
-0
cmake/make_dist.cmake.in
cmake/make_dist.cmake.in
+2
-0
cmake/os/AIX.cmake
cmake/os/AIX.cmake
+2
-2
cmake/os/FreeBSD.cmake
cmake/os/FreeBSD.cmake
+2
-1
cmake/os/WindowsCache.cmake
cmake/os/WindowsCache.cmake
+0
-1
cmake/ssl.cmake
cmake/ssl.cmake
+2
-2
config.h.cmake
config.h.cmake
+39
-0
configure.cmake
configure.cmake
+42
-12
configure.in
configure.in
+1
-3
extra/yassl/CMakeLists.txt
extra/yassl/CMakeLists.txt
+1
-1
extra/yassl/taocrypt/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt
+1
-0
packaging/WiX/CPackWixConfig.cmake
packaging/WiX/CPackWixConfig.cmake
+5
-2
packaging/WiX/create_msi.cmake.in
packaging/WiX/create_msi.cmake.in
+1
-0
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+41
-7
scripts/mysql_config.sh
scripts/mysql_config.sh
+2
-0
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+23
-2
sql/sys_vars.cc
sql/sys_vars.cc
+1
-1
No files found.
CMakeLists.txt
View file @
226852ea
...
...
@@ -144,9 +144,9 @@ IF(WITH_ERROR_INJECT)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DERROR_INJECT_SUPPORT"
)
ENDIF
()
OPTION
(
ENABLE_LOCAL_INFILE
OPTION
(
ENABLE
D
_LOCAL_INFILE
"If we should should enable LOAD DATA LOCAL by default"
${
IF_WIN
}
)
MARK_AS_ADVANCED
(
ENABLE_LOCAL_INFILE
)
MARK_AS_ADVANCED
(
ENABLE
D
_LOCAL_INFILE
)
OPTION
(
WITH_FAST_MUTEXES
"Compile with fast mutexes"
OFF
)
MARK_AS_ADVANCED
(
WITH_FAST_MUTEXES
)
...
...
cmake/build_configurations/mysql_release.cmake
View file @
226852ea
...
...
@@ -15,6 +15,18 @@
# This file includes build settings used for MySQL release
INCLUDE
(
CheckIncludeFiles
)
INCLUDE
(
CheckLibraryExists
)
INCLUDE
(
CheckTypeSize
)
# XXX package_name.cmake uses this too, move it somewhere global
CHECK_TYPE_SIZE
(
"void *"
SIZEOF_VOIDP
)
IF
(
SIZEOF_VOIDP EQUAL 4
)
SET
(
32BIT 1
)
ENDIF
()
IF
(
SIZEOF_VOIDP EQUAL 8
)
SET
(
64BIT 1
)
ENDIF
()
SET
(
FEATURE_SET
"community"
CACHE STRING
" Selection of features. Options are
...
...
@@ -76,15 +88,14 @@ IF(FEATURE_SET)
SET
(
WITH_
${
eng
}
_STORAGE_ENGINE OFF CACHE BOOL
""
)
ELSE
()
SET
(
WITH_
${
eng
}
_STORAGE_ENGINE ON CACHE BOOL
""
)
ENDIF
()
ENDIF
()
ENDFOREACH
()
ENDIF
()
OPTION
(
ENABLE_LOCAL_INFILE
""
ON
)
OPTION
(
ENABLE
D
_LOCAL_INFILE
""
ON
)
SET
(
WITH_SSL bundled CACHE STRING
""
)
SET
(
WITH_ZLIB bundled CACHE STRING
""
)
IF
(
NOT COMPILATION_COMMENT
)
SET
(
COMPILATION_COMMENT
"MySQL Community Server (GPL)"
)
ENDIF
()
...
...
@@ -103,46 +114,75 @@ IF(UNIX)
ENDIF
()
OPTION
(
WITH_PIC
""
ON
)
# Why?
ENDIF
()
# Ensure aio is available on Linux (required by InnoDB)
IF
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
CHECK_INCLUDE_FILES
(
libaio.h HAVE_LIBAIO_H
)
CHECK_LIBRARY_EXISTS
(
aio io_queue_init
""
HAVE_LIBAIO
)
IF
(
NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO
)
MESSAGE
(
FATAL_ERROR
"aio is required on Linux"
)
ENDIF
()
ENDIF
()
ENDIF
()
# Compiler options
IF
(
UNIX
)
# Default GCC flags
IF
(
CMAKE_COMPILER_IS_GNUCC
)
SET
(
COMMON_C_FLAGS
"-g -static-libgcc -fno-omit-frame-pointer"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"-O
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-O3
${
COMMON_C_FLAGS
}
"
)
ENDIF
()
IF
(
CMAKE_COMPILER_IS_GNUCXX
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -O3 -static-libgcc -fno-omit-frame-pointer"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g -O3 -static-libgcc -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"
)
SET
(
COMMON_CXX_FLAGS
"-g -static-libgcc -fno-omit-frame-pointer"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"-O
${
COMMON_CXX_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O3
${
COMMON_CXX_FLAGS
}
"
)
ENDIF
()
# HPUX flags
IF
(
CMAKE_SYSTEM_NAME MATCHES
"HP-UX"
)
IF
(
CMAKE_C_COMPILER_ID MATCHES
"HP"
)
IF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"ia64"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
+DD64 +DSitanium2 -mt -AC99"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
+DD64 +DSitanium2 -mt -Aa"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
+O2"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS
}
+O2"
)
SET
(
COMMON_C_FLAGS
"+DSitanium2 -mt -AC99"
)
SET
(
COMMON_CXX_FLAGS
"+DSitanium2 -mt -Aa"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"+O0 -g
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"+O0 -g
${
COMMON_CXX_FLAGS
}
"
)
# We have seen compiler bugs with optimisation and -g, so disabled for now
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"+O2
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"+O2
${
COMMON_CXX_FLAGS
}
"
)
ENDIF
()
ENDIF
()
SET
(
WITH_SSL
)
SET
(
WITH_SSL
no
)
ENDIF
()
# Linux flags
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
IF
(
CMAKE_C_COMPILER_ID MATCHES
"Intel"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-static-intel -static-libgcc -g -O3 -unroll2 -ip -mp -restrict -no-ftz -no-prefetch"
)
SET
(
COMMON_C_FLAGS
"-static-intel -static-libgcc -g -mp -restrict"
)
SET
(
COMMON_CXX_FLAGS
"-static-intel -static-libgcc -g -mp -restrict -fno-exceptions -fno-rtti"
)
IF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"ia64"
)
SET
(
COMMON_C_FLAGS
"
${
COMMON_C_FLAGS
}
-no-ftz -no-prefetch"
)
SET
(
COMMON_CXX_FLAGS
"
${
COMMON_CXX_FLAGS
}
-no-ftz -no-prefetch"
)
ENDIF
()
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
COMMON_CXX_FLAGS
}
"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-O3 -unroll2 -ip
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O3 -unroll2 -ip
${
COMMON_CXX_FLAGS
}
"
)
SET
(
WITH_SSL no
)
ENDIF
()
ENDIF
()
# OSX flags
IF
(
APPLE
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -Os -fno-common"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g -Os -felide-constructors -fno-common"
)
SET
(
COMMON_C_FLAGS
"-g -fno-common"
)
# XXX: why are we using -felide-constructors on OSX?
SET
(
COMMON_CXX_FLAGS
"-g -fno-common -felide-constructors"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"-O
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"-O
${
COMMON_CXX_FLAGS
}
"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-Os
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-Os
${
COMMON_CXX_FLAGS
}
"
)
ENDIF
()
# Solaris flags
...
...
@@ -153,37 +193,48 @@ IF(UNIX)
ENDIF
()
IF
(
CMAKE_C_COMPILER_ID MATCHES
"SunPro"
)
IF
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"i386"
)
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 4
)
# Solaris x86
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g0 -xO2 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic
"
)
ELSE
(
)
# Solaris x64
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g0 -xO3 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic"
)
ENDIF
()
ELSE
()
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 4
)
# Solaris sparc 32 bit
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -xO3 -Xa -xstrconst -mt
-xarch=sparc"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g0 -xO3 -noex -mt
-xarch=sparc"
)
ELSE
()
# Solaris sparc 64 bit
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-g -xO3 -Xa -xstrconst -mt
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-g0 -xO3 -noex -mt
"
)
ENDIF
(
)
ENDIF
()
SET
(
COMMON_C_FLAGS
"-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic"
)
SET
(
COMMON_CXX_FLAGS
"-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
COMMON_CXX_FLAGS
}
"
)
IF
(
32BIT
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-xO2
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-xO2
${
COMMON_CXX_FLAGS
}
"
)
ELSEIF
(
64BIT
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-xO3
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-xO3
${
COMMON_CXX_FLAGS
}
"
)
ENDIF
()
ELSE
()
# Assume !x86 is SPARC
SET
(
COMMON_C_FLAGS
"-g -Xa -xstrconst -mt"
)
SET
(
COMMON_CXX_FLAGS
"-g0 -noex -mt"
)
IF
(
32BIT
)
SET
(
COMMON_C_FLAGS
"
${
COMMON_C_FLAGS
}
-xarch=sparc"
)
SET
(
COMMON_CXX_FLAGS
"
${
COMMON_CXX_FLAGS
}
-xarch=sparc"
)
ENDIF
()
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
COMMON_CXX_FLAGS
}
"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-xO3
${
COMMON_C_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-xO3
${
COMMON_CXX_FLAGS
}
"
)
ENDIF
()
ENDIF
()
ENDIF
()
IF
(
CMAKE_C_FLAGS_DEBUG
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
"
CACHE STRING
"Debug C compile flags"
)
ENDIF
()
IF
(
CMAKE_CXX_FLAGS_DEBUG
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
"
CACHE STRING
"Debug C++ compile flags"
)
ENDIF
()
IF
(
CMAKE_C_FLAGS_RELWITHDEBINFO
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
"
CACHE STRING
"RelWithDebInfo C compile flags"
)
ENDIF
()
IF
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
"
CACHE STRING
"Compile flags"
)
SET
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
"
CACHE STRING
"Compile flags"
)
CACHE STRING
"RelWithDebInfo C++ compile flags"
)
ENDIF
()
ENDIF
()
cmake/cpack_source_ignore_files.cmake
View file @
226852ea
...
...
@@ -36,5 +36,6 @@ include/config\\\\.h$
include/my_config\\\\.h$
/autom4te\\\\.cache/
errmsg\\\\.sys$
storage/ndb/
#
)
cmake/make_dist.cmake.in
View file @
226852ea
...
...
@@ -53,6 +53,8 @@ IF(BZR_EXECUTABLE)
RESULT_VARIABLE RESULT
)
FILE(REMOVE_RECURSE ${PACKAGE_DIR}/storage/ndb)
IF(NOT RESULT EQUAL 0)
SET(BZR_EXECUTABLE)
ENDIF()
...
...
cmake/os/AIX.cmake
View file @
226852ea
...
...
@@ -28,6 +28,6 @@ INCLUDE(CheckCXXCompilerFlag)
# The following is required to export all symbols
# (also with leading underscore)
STRING
(
REPLACE
"-bexpall"
"-bexpfull"
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
${
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
}
")
"
${
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
}
"
)
STRING
(
REPLACE
"-bexpall"
"-bexpfull"
CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
"
${
CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
}
")
\ No newline at end of file
"
${
CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
}
"
)
cmake/os/FreeBSD.cmake
View file @
226852ea
...
...
@@ -20,4 +20,5 @@
# #Legacy option, maybe not needed anymore , taken as is from autotools build
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
ADD_DEFINITIONS
(
-DHAVE_BROKEN_REALPATH
)
# The below was used for really old versions of FreeBSD, roughly: before 5.1.9
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
cmake/os/WindowsCache.cmake
View file @
226852ea
...
...
@@ -263,7 +263,6 @@ SET(HAVE_SYS_DIR_H CACHE INTERNAL "")
SET
(
HAVE_SYS_ERRLIST CACHE INTERNAL
""
)
SET
(
HAVE_SYS_FILE_H CACHE INTERNAL
""
)
SET
(
HAVE_SYS_FPU_H CACHE INTERNAL
""
)
SET
(
HAVE_SYS_IOCTL CACHE INTERNAL
""
)
SET
(
HAVE_SYS_IOCTL_H CACHE INTERNAL
""
)
SET
(
HAVE_SYS_IPC_H CACHE INTERNAL
""
)
SET
(
HAVE_SYS_MALLOC_H CACHE INTERNAL
""
)
...
...
cmake/ssl.cmake
View file @
226852ea
...
...
@@ -29,14 +29,14 @@ MACRO (MYSQL_USE_BUNDLED_SSL)
CHANGE_SSL_SETTINGS
(
"bundled"
)
#Remove -fno-implicit-templates
#(yassl sources cannot be compiled with it)
SET
(
SAVE_CXX_FLAGS
${
CXX_FLAGS
}
)
SET
(
SAVE_CXX_FLAGS
${
C
MAKE_C
XX_FLAGS
}
)
IF
(
CMAKE_CXX_FLAGS
)
STRING
(
REPLACE
"-fno-implicit-templates"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
ENDIF
()
ADD_SUBDIRECTORY
(
extra/yassl
)
ADD_SUBDIRECTORY
(
extra/yassl/taocrypt
)
SET
(
CXX_FLAGS
${
SAVE_CXX_FLAGS
}
)
SET
(
C
MAKE_C
XX_FLAGS
${
SAVE_CXX_FLAGS
}
)
GET_TARGET_PROPERTY
(
src yassl SOURCES
)
FOREACH
(
file
${
src
}
)
SET
(
SSL_SOURCES
${
SSL_SOURCES
}
${
CMAKE_SOURCE_DIR
}
/extra/yassl/
${
file
}
)
...
...
config.h.cmake
View file @
226852ea
...
...
@@ -22,11 +22,14 @@
#cmakedefine HAVE_ALLOCA_H 1
#cmakedefine HAVE_AIO_H 1
#cmakedefine HAVE_ARPA_INET_H 1
#cmakedefine HAVE_ASM_MSR_H 1
#cmakedefine HAVE_ASM_TERMBITS_H 1
#cmakedefine HAVE_BSEARCH 1
#cmakedefine HAVE_CRYPT_H 1
#cmakedefine HAVE_CURSES_H 1
#cmakedefine HAVE_CXXABI_H 1
#cmakedefine HAVE_NCURSES_H 1
#cmakedefine HAVE_NDIR_H 1
#cmakedefine HAVE_DIRENT_H 1
#cmakedefine HAVE_DLFCN_H 1
#cmakedefine HAVE_EXECINFO_H 1
...
...
@@ -70,6 +73,7 @@
#cmakedefine HAVE_SYS_IPC_H 1
#cmakedefine HAVE_SYS_MALLOC_H 1
#cmakedefine HAVE_SYS_MMAN_H 1
#cmakedefine HAVE_SYS_NDIR_H 1
#cmakedefine HAVE_SYS_PTE_H 1
#cmakedefine HAVE_SYS_PTEM_H 1
#cmakedefine HAVE_SYS_PRCTL_H 1
...
...
@@ -87,6 +91,7 @@
#cmakedefine HAVE_SYS_UN_H 1
#cmakedefine HAVE_SYS_VADVISE_H 1
#cmakedefine HAVE_TERM_H 1
#cmakedefine HAVE_TERMBITS_H 1
#cmakedefine HAVE_TERMIOS_H 1
#cmakedefine HAVE_TERMIO_H 1
#cmakedefine HAVE_TERMCAP_H 1
...
...
@@ -98,6 +103,7 @@
#cmakedefine HAVE_SYS_UTIME_H 1
#cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine HAVE_SYS_PARAM_H 1
#cmakedefine HAVE_XFS_XFS_H 1
/* Libraries */
#cmakedefine HAVE_LIBPTHREAD 1
...
...
@@ -130,9 +136,11 @@
#cmakedefine HAVE_BMOVE 1
#cmakedefine HAVE_BZERO 1
#cmakedefine HAVE_INDEX 1
#cmakedefine HAVE_CHOWN 1
#cmakedefine HAVE_CLOCK_GETTIME 1
#cmakedefine HAVE_CRYPT 1
#cmakedefine HAVE_CUSERID 1
#cmakedefine HAVE_CXX_NEW 1
#cmakedefine HAVE_DIRECTIO 1
#cmakedefine HAVE_DLERROR 1
#cmakedefine HAVE_DLOPEN 1
...
...
@@ -147,6 +155,7 @@
#cmakedefine HAVE_FPSETMASK 1
#cmakedefine HAVE_FSEEKO 1
#cmakedefine HAVE_FSYNC 1
#cmakedefine HAVE_FTIME 1
#cmakedefine HAVE_GETADDRINFO 1
#cmakedefine HAVE_GETCWD 1
#cmakedefine HAVE_GETHOSTBYADDR_R 1
...
...
@@ -176,6 +185,8 @@
#cmakedefine HAVE_LOG2 1
#cmakedefine HAVE_LONGJMP 1
#cmakedefine HAVE_LSTAT 1
#cmakedefine HAVE_MEMALIGN 1
/*
#cmakedefine HAVE_MLOCK 1 see Bug#54662 */
#cmakedefine HAVE_NPTL 1
#cmakedefine HAVE_NL_LANGINFO 1
#cmakedefine HAVE_MADVISE 1
...
...
@@ -196,6 +207,8 @@
#cmakedefine HAVE_PREAD 1
#cmakedefine HAVE_PAUSE_INSTRUCTION 1
#cmakedefine HAVE_FAKE_PAUSE_INSTRUCTION 1
#cmakedefine HAVE_RDTSCLL 1
#cmakedefine HAVE_READ_REAL_TIME 1
#cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
#cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
#cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1
...
...
@@ -240,6 +253,15 @@
#cmakedefine HAVE_SIGWAIT 1
#cmakedefine HAVE_SLEEP 1
#cmakedefine HAVE_SNPRINTF 1
/* Some that currently are not real defines, internal to CMake setup */
/*
#cmakedefine HAVE_FCNTL_NONBLOCK 1 */
/*
#cmakedefine HAVE_FINITE_IN_MATH_H 1 */
/*
#cmakedefine HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 */
/*
#cmakedefine HAVE_SOCKADDR_STORAGE___SS_FAMILY 1 */
/*
#cmakedefine HAVE_SOCKET_SIZE_T_AS_int 1 */
/*
#cmakedefine HAVE_SOCKET_SIZE_T_AS_size_t 1 */
/*
#cmakedefine HAVE_SOCKET_SIZE_T_AS_socklen_t */
/*
#cmakedefine HAVE_SOCKET_TIMEOUT */
#cmakedefine HAVE_STPCPY 1
#cmakedefine HAVE_STRERROR 1
#cmakedefine HAVE_STRCOLL 1
...
...
@@ -560,6 +582,23 @@
#cmakedefine HAVE_UCA_COLLATIONS 1
#cmakedefine HAVE_COMPRESS 1
/*
Hard coded platform settings
*/
/* This is ugly, but we need lots of tweaks for HP-UX */
#cmakedefine HPUX11 1
#cmakedefine DO_NOT_REMOVE_THREAD_WRAPPERS 1
#cmakedefine HAVE_BROKEN_PREAD 1
#cmakedefine HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT 1
#cmakedefine SNPRINTF_RETURN_TRUNC 1
#cmakedefine _INCLUDE_LONGLONG 1
/* Mac OS X */
#cmakedefine SIGNALS_DONT_BREAK_READ 1
#cmakedefine IGNORE_SIGHUP_SIGQUIT 1
#cmakedefine _P1003_1B_VISIBLE 1
#cmakedefine DONT_DECLARE_CXA_PURE_VIRTUAL 1
/*
Stuff that always need to be
defined
(
compile breaks without it
)
...
...
configure.cmake
View file @
226852ea
...
...
@@ -202,6 +202,7 @@ CHECK_INCLUDE_FILES (limits.h HAVE_LIMITS_H)
CHECK_INCLUDE_FILES
(
locale.h HAVE_LOCALE_H
)
CHECK_INCLUDE_FILES
(
malloc.h HAVE_MALLOC_H
)
CHECK_INCLUDE_FILES
(
memory.h HAVE_MEMORY_H
)
CHECK_INCLUDE_FILES
(
ndir.h HAVE_NDIR_H
)
CHECK_INCLUDE_FILES
(
netinet/in.h HAVE_NETINET_IN_H
)
CHECK_INCLUDE_FILES
(
paths.h HAVE_PATHS_H
)
CHECK_INCLUDE_FILES
(
port.h HAVE_PORT_H
)
...
...
@@ -210,7 +211,8 @@ CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
CHECK_INCLUDE_FILES
(
sched.h HAVE_SCHED_H
)
CHECK_INCLUDE_FILES
(
select.h HAVE_SELECT_H
)
CHECK_INCLUDE_FILES
(
semaphore.h HAVE_SEMAPHORE_H
)
CHECK_INCLUDE_FILES
(
sys/dir.h HAVE_SYS_DIR_H
)
CHECK_INCLUDE_FILES
(
"sys/types.h;sys/dir.h"
HAVE_SYS_DIR_H
)
CHECK_INCLUDE_FILES
(
sys/ndir.h HAVE_SYS_NDIR_H
)
CHECK_INCLUDE_FILES
(
sys/pte.h HAVE_SYS_PTE_H
)
CHECK_INCLUDE_FILES
(
stddef.h HAVE_STDDEF_H
)
CHECK_INCLUDE_FILES
(
stdint.h HAVE_STDINT_H
)
...
...
@@ -236,6 +238,8 @@ CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
CHECK_INCLUDE_FILES
(
sys/termcap.h HAVE_SYS_TERMCAP_H
)
CHECK_INCLUDE_FILES
(
"time.h;sys/timeb.h"
HAVE_SYS_TIMEB_H
)
CHECK_INCLUDE_FILES
(
"curses.h;term.h"
HAVE_TERM_H
)
CHECK_INCLUDE_FILES
(
asm/termbits.h HAVE_ASM_TERMBITS_H
)
CHECK_INCLUDE_FILES
(
termbits.h HAVE_TERMBITS_H
)
CHECK_INCLUDE_FILES
(
termios.h HAVE_TERMIOS_H
)
CHECK_INCLUDE_FILES
(
termio.h HAVE_TERMIO_H
)
CHECK_INCLUDE_FILES
(
termcap.h HAVE_TERMCAP_H
)
...
...
@@ -249,11 +253,15 @@ CHECK_INCLUDE_FILES (sys/param.h HAVE_SYS_PARAM_H)
CHECK_INCLUDE_FILES
(
sys/vadvise.h HAVE_SYS_VADVISE_H
)
CHECK_INCLUDE_FILES
(
fnmatch.h HAVE_FNMATCH_H
)
CHECK_INCLUDE_FILES
(
stdarg.h HAVE_STDARG_H
)
CHECK_INCLUDE_FILES
(
"stdlib.h;sys/un.h"
HAVE_SYS_UN_H
)
CHECK_INCLUDE_FILES
(
"stdlib.h;sys/un.h"
HAVE_SYS_UN_H
)
CHECK_INCLUDE_FILES
(
vis.h HAVE_VIS_H
)
CHECK_INCLUDE_FILES
(
wchar.h HAVE_WCHAR_H
)
CHECK_INCLUDE_FILES
(
wctype.h HAVE_WCTYPE_H
)
CHECK_INCLUDE_FILES
(
xfs/xfs.h HAVE_XFS_XFS_H
)
IF
(
HAVE_SYS_STREAM_H
)
# Needs sys/stream.h on Solaris
CHECK_INCLUDE_FILES
(
sys/stream.h sys/ptem.h
HAVE_SYS_PTEM_H
)
CHECK_INCLUDE_FILES
(
"sys/stream.h;sys/ptem.h"
HAVE_SYS_PTEM_H
)
ELSE
()
CHECK_INCLUDE_FILES
(
sys/ptem.h HAVE_SYS_PTEM_H
)
ENDIF
()
...
...
@@ -495,14 +503,15 @@ IF(HAVE_STDINT_H)
SET
(
CMAKE_EXTRA_INCLUDE_FILES stdint.h
)
ENDIF
(
HAVE_STDINT_H
)
IF
(
NOT APPLE
)
# Prevent some checks on OSX, they return ambigious results
# on universal 32/64 bit binariess
MY_CHECK_TYPE_SIZE
(
"void *"
VOIDP
)
MY_CHECK_TYPE_SIZE
(
"char *"
CHARP
)
MY_CHECK_TYPE_SIZE
(
long LONG
)
MY_CHECK_TYPE_SIZE
(
size_t SIZE_T
)
ENDIF
()
# These first four SIZE_* values are not really used on Mac OS X,
# as we only know at comile time what architecture to build for,
# see "config.h.cmake". But as same macro MY_CHECK_TYPE_SIZE also
# sets HAVE_* macros, we run the check here, doesn't hurt.
MY_CHECK_TYPE_SIZE
(
"void *"
VOIDP
)
MY_CHECK_TYPE_SIZE
(
"char *"
CHARP
)
MY_CHECK_TYPE_SIZE
(
long LONG
)
MY_CHECK_TYPE_SIZE
(
size_t SIZE_T
)
MY_CHECK_TYPE_SIZE
(
char CHAR
)
MY_CHECK_TYPE_SIZE
(
short SHORT
)
MY_CHECK_TYPE_SIZE
(
int INT
)
...
...
@@ -750,7 +759,6 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
ENDIF
()
CHECK_SYMBOL_EXISTS
(
tcgetattr
"termios.h"
HAVE_TCGETATTR 1
)
CHECK_INCLUDE_FILES
(
sys/ioctl.h HAVE_SYS_IOCTL 1
)
#
# Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
...
...
@@ -1040,3 +1048,25 @@ CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_IN
CHECK_STRUCT_HAS_MEMBER
(
"struct dirent"
d_namlen
"dirent.h"
STRUCT_DIRENT_HAS_D_NAMLEN
)
SET
(
SPRINTF_RETURNS_INT 1
)
#--------------------------------------------------------------------
# Hard coded platform settings
#--------------------------------------------------------------------
# This is ugly, but we need lots of tweaks for HP-UX
IF
(
CMAKE_SYSTEM_NAME MATCHES
"HP-UX"
)
SET
(
HPUX11 1
)
SET
(
DO_NOT_REMOVE_THREAD_WRAPPERS 1
)
SET
(
HAVE_BROKEN_PREAD 1
)
SET
(
HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT 1
)
SET
(
NO_FCNTL_NONBLOCK 1
)
# Set conditionally in code above
SET
(
SNPRINTF_RETURN_TRUNC 1
)
SET
(
_INCLUDE_LONGLONG 1
)
ENDIF
()
IF
(
APPLE
)
SET
(
DONT_DECLARE_CXA_PURE_VIRTUAL 1
)
SET
(
IGNORE_SIGHUP_SIGQUIT 1
)
SET
(
SIGNALS_DONT_BREAK_READ 1
)
SET
(
SIGNAL_WITH_VIO_CLOSE 1
)
# FIXME better handled in mysql-trunk
SET
(
_P1003_1B_VISIBLE 1
)
ENDIF
()
configure.in
View file @
226852ea
...
...
@@ -1301,9 +1301,7 @@ case $SYSTEM_TYPE in
if
test
"
$OSVERSION
"
-gt
"600000"
then
# Post user-level threads, MYSQLD_NET_RETRY_COUNT is not needed any more
AC_MSG_WARN
([
Adding fix
for
broken
realpath
])
CFLAGS
=
"
$CFLAGS
-DHAVE_BROKEN_REALPATH"
CXXFLAGS
=
"
$CXXFLAGS
-DHAVE_BROKEN_REALPATH"
:
elif
test
"
$OSVERSION
"
-gt
"480100"
&&
\
test
"
$OSVERSION
"
-lt
"500000"
||
\
test
"
$OSVERSION
"
-gt
"500109"
...
...
extra/yassl/CMakeLists.txt
View file @
226852ea
...
...
@@ -28,7 +28,7 @@ ${CMAKE_CXX_FLAGS})
ENDIF
()
SET
(
YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp
src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp
src/yassl_imp.cpp src/yassl_int.cpp
)
src/yassl_imp.cpp src/yassl_int.cpp
src/template_instnt.cpp
)
ADD_CONVENIENCE_LIBRARY
(
yassl
${
YASSL_SOURCES
}
)
RESTRICT_SYMBOL_EXPORTS
(
yassl
)
...
...
extra/yassl/taocrypt/CMakeLists.txt
View file @
226852ea
...
...
@@ -21,6 +21,7 @@ ADD_DEFINITIONS(${SSL_DEFINES})
SET
(
TAOCRYPT_SOURCES src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp
src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp
src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp
src/template_instnt.cpp
include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp
include/coding.hpp include/des.hpp include/dh.hpp include/dsa.hpp include/dsa.hpp
include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp
...
...
packaging/WiX/CPackWixConfig.cmake
View file @
226852ea
...
...
@@ -3,8 +3,11 @@ IF(ESSENTIALS)
MESSAGE
(
"Essentials!"
)
SET
(
CPACK_COMPONENTS_USED
"Server;Client;DataFiles"
)
SET
(
CPACK_WIX_UI
"WixUI_InstallDir"
)
MATH
(
EXPR bits
${
CMAKE_SIZEOF_VOID_P
}
*8
)
SET
(
CPACK_PACKAGE_FILE_NAME
"mysql-essentials-
${
MAJOR_VERSION
}
.
${
MINOR_VERSION
}
.
${
PATCH
}
-win
${
bits
}
"
)
IF
(
CMAKE_SIZEOF_VOID_P MATCHES 8
)
SET
(
CPACK_PACKAGE_FILE_NAME
"mysql-essential-
${
VERSION
}
-winx64"
)
ELSE
()
SET
(
CPACK_PACKAGE_FILE_NAME
"mysql-essential-
${
VERSION
}
-win32"
)
ENDIF
()
ELSE
()
SET
(
CPACK_COMPONENTS_USED
"Server;Client;DataFiles;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts"
)
...
...
packaging/WiX/create_msi.cmake.in
View file @
226852ea
...
...
@@ -4,6 +4,7 @@ SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
SET(VERSION "@VERSION@")
SET(MAJOR_VERSION "@MAJOR_VERSION@")
SET(MINOR_VERSION "@MINOR_VERSION@")
SET(PATCH "@PATCH@")
...
...
scripts/CMakeLists.txt
View file @
226852ea
...
...
@@ -90,15 +90,13 @@ IF(MALLOC_LIB)
ENDIF
()
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles"
)
# No multiconfig build - use CMAKE_C_FLAGS
SET
(
CFLAGS
"@CMAKE_C_FLAGS@"
)
SET
(
CXXFLAGS
"@CMAKE_CXX_FLAGS@"
)
SET
(
CFLAGS
"@CMAKE_C_FLAGS@ @CMAKE_C_FLAGS_RELWITHDEBINFO@"
)
SET
(
CXXFLAGS
"@CMAKE_CXX_FLAGS@ @CMAKE_CXX_FLAGS_RELWITHDEBINFO@"
)
FOREACH
(
ARCH
${
CMAKE_OSX_ARCHITECTURES
}
)
SET
(
CFLAGS
"
${
CFLAGS
}
-arch
${
ARCH
}
"
)
SET
(
CXXFLAGS
"
${
CXXFLAGS
}
-arch
${
ARCH
}
"
)
ENDFOREACH
()
ELSE
()
# Multiconfig build - use CMAKE_C_FLAGS_RELWITHDEBINFO
SET
(
CFLAGS
"@CMAKE_C_FLAGS_RELWITHDEBINFO@"
)
SET
(
CXXFLAGS
"@CMAKE_CXX_FLAGS_RELWITHDEBINFO@"
)
ENDIF
()
...
...
@@ -140,6 +138,43 @@ ENDIF()
SET
(
HOSTNAME
"hostname"
)
# Required for mysqlbug until autotools are deprecated, once done remove these
# and expand default cmake variables
SET
(
CC
${
CMAKE_C_COMPILER
}
)
SET
(
CXX
${
CMAKE_CXX_COMPILER
}
)
SET
(
SAVE_CC
${
CMAKE_C_COMPILER
}
)
SET
(
SAVE_CXX
${
CMAKE_CXX_COMPILER
}
)
SET
(
SAVE_CFLAGS
${
CFLAGS
}
)
SET
(
SAVE_CXXFLAGS
${
CXXFLAGS
}
)
# XXX no cmake equivalent for this, just make one up
SET
(
CONFIGURE_LINE
"Built using CMake"
)
# Also required for mysqlbug, autoconf only supports --version so for now we
# just explicitly require GNU
IF
(
CMAKE_COMPILER_IS_GNUCC
)
EXECUTE_PROCESS
(
COMMAND
${
CMAKE_C_COMPILER
}
${
CMAKE_C_COMPILER_ARG1
}
--version
COMMAND sed 1q
OUTPUT_VARIABLE CC_VERSION
)
ELSE
()
SET
(
CC_VERSION
""
)
ENDIF
()
IF
(
CMAKE_COMPILER_IS_GNUCXX
)
EXECUTE_PROCESS
(
COMMAND
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
--version
COMMAND sed 1q
OUTPUT_VARIABLE CXX_VERSION
)
ELSE
()
SET
(
CXX_VERSION
""
)
ENDIF
()
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/mysqlbug.sh
${
CMAKE_CURRENT_BINARY_DIR
}
/mysqlbug ESCAPE_QUOTES @ONLY
)
INSTALL_SCRIPT
(
${
CMAKE_CURRENT_BINARY_DIR
}
/mysqlbug
DESTINATION
${
INSTALL_BINDIR
}
COMPONENT Server
)
ENDIF
(
UNIX
)
# Really ugly, one script, "mysql_install_db", needs prefix set to ".",
...
...
@@ -196,9 +231,9 @@ SET(localstatedir ${MYSQL_DATADIR})
# some scripts use @TARGET_LINUX@
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
SET
(
TARGET_LINUX
1
)
SET
(
TARGET_LINUX
"true"
)
ELSE
()
SET
(
TARGET_LINUX
0
)
SET
(
TARGET_LINUX
"false"
)
ENDIF
()
# Use cmake variables to inspect dependencies for
...
...
@@ -292,7 +327,6 @@ ELSE()
mysql_zap
mysqlaccess
mysqlaccess.conf
mysqlbug
mysql_convert_table_format
mysql_find_rows
mysqlhotcopy
...
...
scripts/mysql_config.sh
View file @
226852ea
...
...
@@ -88,6 +88,8 @@ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
fix_path pkglibdir
$pkglibdir_rel
lib/mysql lib
plugindir
=
'@pkgplugindir@'
plugindir_rel
=
`
echo
$plugindir
|
sed
-e
"s;^
$basedir
/;;"
`
fix_path plugindir
$plugindir_rel
lib/mysql/plugin lib/plugin
pkgincludedir
=
'@pkgincludedir@'
fix_path pkgincludedir include/mysql include
...
...
scripts/mysqld_safe.sh
View file @
226852ea
...
...
@@ -413,6 +413,29 @@ else
DATADIR
=
@localstatedir@
fi
#
# Try to find the plugin directory
#
# Use user-supplied argument
if
[
-n
"
${
PLUGIN_DIR
}
"
]
;
then
plugin_dir
=
"
${
PLUGIN_DIR
}
"
else
# Try to find plugin dir relative to basedir
for
dir
in
lib/mysql/plugin lib/plugin
do
if
[
-d
"
${
MY_BASEDIR_VERSION
}
/
${
dir
}
"
]
;
then
plugin_dir
=
"
${
MY_BASEDIR_VERSION
}
/
${
dir
}
"
break
fi
done
# Give up and use compiled-in default
if
[
-z
"
${
plugin_dir
}
"
]
;
then
plugin_dir
=
'@pkgplugindir@'
fi
fi
plugin_dir
=
"
${
plugin_dir
}${
PLUGIN_VARIANT
}
"
if
test
-z
"
$MYSQL_HOME
"
then
if
test
-r
"
$MY_BASEDIR_VERSION
/my.cnf"
&&
test
-r
"
$DATADIR
/my.cnf"
...
...
@@ -704,8 +727,6 @@ fi
cmd
=
"
`
mysqld_ld_preload_text
`
$NOHUP_NICENESS
"
plugin_dir
=
"
${
PLUGIN_DIR
:-
$MY_BASEDIR_VERSION
/lib/mysql/plugin
}${
PLUGIN_VARIANT
}
"
for
i
in
"
$ledir
/
$MYSQLD
"
"
$defaults
"
"--basedir=
$MY_BASEDIR_VERSION
"
\
"--datadir=
$DATADIR
"
"--plugin-dir=
$plugin_dir
"
"
$USER_OPTION
"
do
...
...
sql/sys_vars.cc
View file @
226852ea
...
...
@@ -875,7 +875,7 @@ static Sys_var_uint Sys_large_page_size(
static
Sys_var_mybool
Sys_large_pages
(
"large_pages"
,
"Enable support for large pages"
,
READ_ONLY
GLOBAL_VAR
(
opt_large_
fil
es
),
READ_ONLY
GLOBAL_VAR
(
opt_large_
pag
es
),
IF_WIN
(
NO_CMD_LINE
,
CMD_LINE
(
OPT_ARG
)),
DEFAULT
(
FALSE
));
static
Sys_var_charptr
Sys_language
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment