pyrox.dev
lol
1--- mysql-5.5.17/cmake/install_macros.cmake 2011-10-12 07:10:24.000000000 -0500
2+++ mysql-5.5.17/cmake/install_macros.cmake 2011-11-07 23:19:35.772837800 -0600
3@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
4 IF(ARG_COMPONENT)
5 SET(COMP COMPONENT ${ARG_COMPONENT})
6 ENDIF()
7- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
8+ IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")
9+ INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}
10+ RUNTIME DESTINATION bin
11+ ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})
12+ ELSE()
13+ INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
14+ ENDIF()
15 SET(INSTALL_LOCATION ${ARG_DESTINATION} )
16 INSTALL_DEBUG_SYMBOLS("${TARGETS}")
17 SET(INSTALL_LOCATION)
18--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500
19+++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600
20@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)
21 SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
22 SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
23
24+ IF(NOT CYGWIN)
25 # Install links to libmysqlclient.so (client_r)
26 GET_VERSIONED_LIBNAME(
27 "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
28@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)
29 linkname)
30 INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
31 ENDFOREACH()
32+ ENDIF(NOT CYGWIN)
33 ENDIF()
34 ENDIF()
35--- mysql-5.5.17/strings/dtoa.c 2011-10-12 07:10:25.000000000 -0500
36+++ mysql-5.5.17/strings/dtoa.c 2011-11-07 20:38:05.064690100 -0600
37@@ -36,6 +36,7 @@
38
39 ***************************************************************/
40
41+#define __STRICT_ANSI__
42 #include <my_base.h> /* for EOVERFLOW on Windows */
43 #include <my_global.h>
44 #include <m_string.h> /* for memcpy and NOT_FIXED_DEC */