1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build on windows

Browse Source
This commit is contained in:
Sergei Golubchik 2011-11-02 12:26:30 +01:00
parent 952e4067ad
commit 7714adaef8
10 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -285,12 +285,7 @@ SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
ENDIF()
ADD_SUBDIRECTORY(include)
IF(CMAKE_GENERATOR MATCHES "Makefiles" AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
SET(DBUG_LIBRARY)
ELSE()
SET(DBUG_LIBRARY dbug)
ADD_SUBDIRECTORY(dbug)
ENDIF()
ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(regex)

10
dbug/dbug.c
View File

@ -86,6 +86,8 @@
#include <m_string.h>
#include <errno.h>
#ifndef DBUG_OFF
#ifdef HAVE_FNMATCH_H
#include <fnmatch.h>
#else
@ -424,7 +426,7 @@ void _db_process_(const char *name)
* 0 - a list of functions was not changed
*/
int DbugParse(CODE_STATE *cs, const char *control)
static int DbugParse(CODE_STATE *cs, const char *control)
{
const char *end;
int rel, f_used=0;
@ -661,7 +663,7 @@ int DbugParse(CODE_STATE *cs, const char *control)
(ListFlags(cs->stack->functions) & INCLUDE) ? \
0 : (uint)TRACE_ON)
void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
static void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
struct _db_stack_frame_ *framep)
{
if (framep->prev)
@ -687,7 +689,7 @@ void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
#define fflags(cs) cs->stack->out_file ? ListFlags(cs->stack->functions) : TRACE_ON;
void FixTraceFlags(uint old_fflags, CODE_STATE *cs)
static void FixTraceFlags(uint old_fflags, CODE_STATE *cs)
{
const char *func;
uint new_fflags, traceon, level;
@ -2491,3 +2493,5 @@ static void sf_terminate()
return;
}
#endif /* DBUG_OFF */

7
dbug/my_main.c
View File

@ -3,10 +3,6 @@
fixed so that it could compile and run in MySQL source tree
*/
#ifdef DBUG_OFF /* We are testing dbug */
#undef DBUG_OFF
#endif
#include <my_global.h> /* This includes dbug.h */
#include <my_pthread.h>
@ -16,9 +12,6 @@ char *argv[];
{
register int result, ix;
extern int factorial(int);
#if defined(HAVE_PTHREAD_INIT)
pthread_init(); /* Must be called before DBUG_ENTER */
#endif
my_thread_global_init();
{

2
libmysql/CMakeLists.txt
View File

@ -150,7 +150,7 @@ ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
DTRACE_INSTRUMENT(clientlib)
ADD_DEPENDENCIES(clientlib GenError)
SET(LIBS clientlib ${DBUG_LIBRARY} strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.

2
libmysqld/CMakeLists.txt
View File

@ -113,7 +113,7 @@ ENDIF()
SET(LIBS
${DBUG_LIBRARY} strings regex mysys vio
dbug strings regex mysys vio
${ZLIB_LIBRARY} ${SSL_LIBRARIES}
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${MYSQLD_STATIC_PLUGIN_LIBS}

2
mysys/CMakeLists.txt
View File

@ -66,7 +66,7 @@ IF(HAVE_MLOCK)
ENDIF()
ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
TARGET_LINK_LIBRARIES(mysys ${DBUG_LIBRARY} strings ${ZLIB_LIBRARY}
TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT})
DTRACE_INSTRUMENT(mysys)

2
sql/CMakeLists.txt
View File

@ -92,7 +92,7 @@ ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
ADD_DEPENDENCIES(sql GenServerSource)
DTRACE_INSTRUMENT(sql)
TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
mysys ${DBUG_LIBRARY} strings vio regex
mysys dbug strings vio regex
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
${SSL_LIBRARIES})

4
storage/heap/CMakeLists.txt
View File

@ -22,7 +22,7 @@ SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create
MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
ADD_EXECUTABLE(hp_test1 hp_test1.c)
TARGET_LINK_LIBRARIES(hp_test1 heap mysys ${DBUG_LIBRARY} strings)
TARGET_LINK_LIBRARIES(hp_test1 heap mysys dbug strings)
ADD_EXECUTABLE(hp_test2 hp_test2.c)
TARGET_LINK_LIBRARIES(hp_test2 heap mysys ${DBUG_LIBRARY} strings)
TARGET_LINK_LIBRARIES(hp_test2 heap mysys dbug strings)

3
storage/innobase/sync/sync0sync.c
View File

@ -35,6 +35,9 @@ Created 9/5/1995 Heikki Tuuri
#include "sync0sync.ic"
#endif
/* disable timed_mutexes - obsolete feature that doesn't link on windows */
#define timed_mutexes 0
#include "sync0rw.h"
#include "buf0buf.h"
#include "srv0srv.h"

2
storage/maria/unittest/CMakeLists.txt
View File

@ -16,7 +16,7 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/unittest/mytap)
LINK_LIBRARIES(aria myisam mytap mysys ${DBUG_LIBRARY} strings ${ZLIB_LIBRARY})
LINK_LIBRARIES(aria myisam mytap mysys dbug strings ${ZLIB_LIBRARY})
MY_ADD_TESTS(ma_control_file trnman)