5.2->5.3 merge

This commit is contained in:
Sergei Golubchik 2011-12-12 13:00:33 +01:00
commit 745c53ec06
47 changed files with 902 additions and 200 deletions

View file

@ -21,7 +21,7 @@ IF(WIN32)
ADD_DEFINITIONS(-DUSE_TLS)
ENDIF(WIN32)
ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY -DHAVE_DLOPEN)
ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysqld