database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fixes for opensolaris compilation failures

Browse Source
This commit is contained in:
Sergei Golubchik
2012-01-05 18:56:31 +01:00
parent d261734391
commit 506984181b
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/compile-solaris-amd64
View File

@ -26,7 +26,7 @@ path=`dirname $0`
extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64" extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64"
extra_configs="$amd64_configs $max_configs --with-libevent" extra_configs="$amd64_configs $max_configs --with-libevent"
LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64" LDFLAGS="-m64 -lmtmalloc -R/usr/sfw/lib/64"
export LDFLAGS export LDFLAGS
. "$path/FINISH.sh" . "$path/FINISH.sh"

10
dbug/dbug.c
View File

@ -2147,4 +2147,14 @@ const char* _db_get_func_(void)
return cs->func; return cs->func;
} }
#else
/*
* Dummy function, workaround for build failure on a platform where linking
* with an empty archive fails.
*/
int i_am_a_dummy_function() {
return 0;
}
#endif /* DBUG_OFF */ #endif /* DBUG_OFF */

2
mysql-test/suite/federated/federated_debug-master.opt
View File

@ -1 +1 @@
--loose-debug=d,simulate_detached_thread_refresh --loose-debug-dbug=d,simulate_detached_thread_refresh

2
mysys/CMakeLists.txt
View File

@ -66,7 +66,7 @@ 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 strings ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT}) ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET})
DTRACE_INSTRUMENT(mysys) DTRACE_INSTRUMENT(mysys)
IF(HAVE_BFD_H) IF(HAVE_BFD_H)