mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fixes , define HAVE_RWLOCK_T on Solaris define

Browse source 
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
This commit is contained in:
Vladislav Vaintroub 2010-01-14 18:42:28 +00:00
parent 6b6f0ca461
commit cd45a44180
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.cmake
View file

@ -177,6 +177,10 @@ ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX" AND CMAKE_SYSTEM MATCHES "11")
ADD_DEFINITIONS(-DHPUX11)
ENDIF()
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
ADD_DEFINITIONS(-DHAVE_RWLOCK_T)
ENDIF()
# Disable warnings in Visual Studio 8 and above
IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
#TODO: update the code and remove the disabled warnings

4
storage/perfschema/CMakeLists.txt
View file

@ -75,3 +75,7 @@ SET(PERFSCHEMA_SOURCES ha_perfschema.h
)
MYSQL_ADD_PLUGIN(PERFSCHEMA ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY)
IF(WITH_PERFSCHEMA_STORAGE_ENGINE AND WITH_UNIT_TESTS)
ENABLE_TESTING()
ADD_SUBDIRECTORY(unittest)
ENDIF()

28
storage/perfschema/unittest/CMakeLists.txt
View file

@ -23,17 +23,19 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
ADD_DEFINITIONS(-DMYSQL_SERVER)
LINK_LIBRARIES(perfschema mytap mysys dbug strings)
ADD_EXECUTABLE(pfs_instr_class-t pfs_instr_class-t.cc)
ADD_EXECUTABLE(pfs_instr_class-oom-t pfs_instr_class-oom-t.cc)
ADD_EXECUTABLE(pfs_instr-t pfs_instr-t.cc)
ADD_EXECUTABLE(pfs_instr-oom-t pfs_instr-oom-t.cc)
ADD_EXECUTABLE(pfs_timer-t pfs_timer-t.cc)
ADD_EXECUTABLE(pfs-t pfs-t.cc)
MACRO (PFS_ADD_TEST name)
ADD_EXECUTABLE(${name}-t ${name}-t.cc)
TARGET_LINK_LIBRARIES(${name}-t mytap perfschema mysys)
ADD_TEST(${name} ${name}-t)
ENDMACRO()
SET(tests
pfs_instr_class
pfs_instr_class-oom
pfs_instr
pfs_instr-oom
pfs
)
FOREACH(testname ${tests})
PFS_ADD_TEST(${testname})
ENDFOREACH()

3
strings/CMakeLists.txt
View file

@ -23,4 +23,7 @@ SET(STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c
str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c
strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c
my_strchr.c strcont.c strinstr.c strnlen.c strappend.c)
# Avoid dependencies on perschema data defined in mysys
ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})