database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - scripts/CMakeLists.txt
This commit is contained in:
Alexander Nozdrin
2010-07-19 18:00:29 +04:00
parent 83c154dc34 226852ea14
commit 9503a8e23f
16 changed files with 262 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/os/WindowsCache.cmake
View File

@ -262,7 +262,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 "")