diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
| commit | 1999be8d4e9d721243c51b04c76ba11ad1e9fa56 (patch) | |
| tree | cd287f49c709f844d10d774643feb5843acf99a6 /cmake | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| parent | b45c551ee32d0d5260f4958abf93efab1a4614a2 (diff) | |
| download | mariadb-git-1999be8d4e9d721243c51b04c76ba11ad1e9fa56.tar.gz | |
Automatic merge with 5.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 1 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 | ||||
| -rw-r--r-- | cmake/readline.cmake | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 8e70af6c5a9..e915e732612 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -65,6 +65,7 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE} SET(CPACK_RPM_PACKAGE_REQUIRES "MariaDB-common") SET(CPACK_RPM_server_USER_FILELIST "%ignore /etc" "%ignore /etc/init.d") +SET(CPACK_RPM_common_USER_FILELIST "%config(noreplace) /etc/my.cnf") SET(CPACK_RPM_client_PACKAGE_OBSOLETES "mysql-client MySQL-client MySQL-OurDelta-client") SET(CPACK_RPM_client_PACKAGE_PROVIDES "MariaDB-client MySQL-client mysql-client") diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 8456cd69b0b..b93a1c12a2e 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -364,4 +364,7 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "") SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "") SET(HAVE_VALGRIND CACHE INTERNAL "") SET(HAVE_EVENT_H CACHE INTERNAL "") +SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "") +SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "") +SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "") ENDIF() diff --git a/cmake/readline.cmake b/cmake/readline.cmake index fd2e690fab9..285b436921e 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -109,6 +109,8 @@ MACRO (FIND_CURSES) ENDIF() ENDIF() ENDIF() + CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} setupterm "" HAVE_SETUPTERM) + CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} vidattr "" HAVE_VIDATTR) ENDMACRO() MACRO (MYSQL_USE_BUNDLED_READLINE) |