Merge branch 'master' into char_to_string

Conflicts:
	common/dbcore.h
This commit is contained in:
Arthur Ice
2013-05-25 21:30:21 -07:00
55 changed files with 576 additions and 623 deletions
+2
View File
@@ -17,6 +17,8 @@ SET(qserv_headers
ADD_EXECUTABLE(queryserv ${qserv_sources} ${qserv_headers})
INSTALL(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
ADD_DEFINITIONS(-DQSERV)
TARGET_LINK_LIBRARIES(queryserv Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY})