database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

compilation fixes: without dbug, without ssl

Browse Source
This commit is contained in:
Sergei Golubchik
2011-07-16 09:07:41 +02:00
parent d89c19ceaa
commit 66a8da0677
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/CMakeLists.txt
View File

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

2
mysys/CMakeLists.txt
View File

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

2
sql/CMakeLists.txt
View File

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

2
sql/sql_acl.cc
View File

@@ -532,11 +532,11 @@ static uchar* acl_entry_get_key(acl_entry *entry, size_t *length,
second packet? second packet?
*/ */
#define SSL_HANDSHAKE_SIZE 2 #define SSL_HANDSHAKE_SIZE 2
#define NORMAL_HANDSHAKE_SIZE 6
#define MIN_HANDSHAKE_SIZE 2 #define MIN_HANDSHAKE_SIZE 2
#else #else
#define MIN_HANDSHAKE_SIZE 6 #define MIN_HANDSHAKE_SIZE 6
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
#define NORMAL_HANDSHAKE_SIZE 6
static DYNAMIC_ARRAY acl_hosts, acl_users, acl_dbs, acl_proxy_users; static DYNAMIC_ARRAY acl_hosts, acl_users, acl_dbs, acl_proxy_users;
static MEM_ROOT mem, memex; static MEM_ROOT mem, memex;

4
storage/heap/CMakeLists.txt
View File

@@ -25,7 +25,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) MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
ADD_EXECUTABLE(hp_test1 hp_test1.c) ADD_EXECUTABLE(hp_test1 hp_test1.c)
TARGET_LINK_LIBRARIES(hp_test1 mysys heap dbug strings) TARGET_LINK_LIBRARIES(hp_test1 heap mysys ${DBUG_LIBRARY} strings)
ADD_EXECUTABLE(hp_test2 hp_test2.c) ADD_EXECUTABLE(hp_test2 hp_test2.c)
TARGET_LINK_LIBRARIES(hp_test2 mysys heap dbug strings) TARGET_LINK_LIBRARIES(hp_test2 heap mysys ${DBUG_LIBRARY} strings)