diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-10-16 17:59:16 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-10-16 17:59:16 +0300 |
| commit | 7ee391c4da479cd7fcae64c595afbeca1e8b2d9d (patch) | |
| tree | eda70b1d92c81b7f2ce5a7bf94447c86da2b558d /libmysql | |
| parent | fb84f573adf00de5e606a3b312bec99d24a0f49c (diff) | |
| download | mariadb-git-7ee391c4da479cd7fcae64c595afbeca1e8b2d9d.tar.gz | |
Fixes to merge between 5.1-main and 5.1-marvel
include/my_atomic.h:
To avoid compiler problems on some platforms, static inline
should be a macro here.
include/my_bit.h:
To avoid compiler problems on windows and solaris
libmysql/CMakeLists.txt:
Added missing library on Windows.
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 8471bbbd76c..6094390b2e7 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -98,7 +98,7 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c - ../mysys/my_getsystime.c ${LIB_SOURCES}) + ../mysys/my_getsystime.c ../mysys/my_sync.c ${LIB_SOURCES}) # Need to set USE_TLS for building the DLL, since __declspec(thread) # approach to thread local storage does not work properly in DLLs. |