3625 Joerg Bruehe 2009-10-05
Hack around a dependency problem regarding "dtrace" files on Solaris.
"mf_keycache.c" currently doesn't build unless "-DTHREAD" is given,
and it also isn't needed in such cases,
but making it totally depend on the automake conditional "THREAD"
breaks the Solaris builds.
As a result of this hack, the error 46980 (bugs DB) will show up again.
modified:
mysys/Makefile.am
3624 Georgi Kodinov 2009-10-05
Fixed a valgrind warning.
modified:
sql/debug_sync.cc
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2009-10-01 20:30:47 +0000
+++ b/mysys/Makefile.am 2009-10-05 11:05:39 +0000
@@ -41,7 +41,7 @@ libmysyslt_la_SOURCES = my_init.c my_get
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
my_pread.c my_write.c my_getpagesize.c \
my_safehash.c \
- mf_keycaches.c my_crc32.c \
+ mf_keycache.c mf_keycaches.c my_crc32.c \
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
my_malloc.c my_realloc.c my_once.c mulalloc.c \
@@ -76,7 +76,7 @@ libmysyslt_la_SOURCES = my_init.c my_get
if THREAD
libmysyslt_la_SOURCES+= thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c waiting_threads.c \
- mf_keycache.c lf_alloc-pin.c
+ lf_alloc-pin.c
endif
EXTRA_DIST = CMakeLists.txt mf_soundex.c \
Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20091005110539-6ayfbuofcs3h7s0w.bundle
| Thread |
|---|
| • bzr push into mysql-pe branch (joerg:3624 to 3625) | Joerg Bruehe | 5 Oct |
