compilation fixes

3 files changed, 4 insertions, 2 deletions

diff --git a/include/waiting_threads.h b/include/waiting_threads.h
index 45c3b140915..1e580529938 100644
--- a/include/waiting_threads.h
+++ b/include/waiting_threads.h
@@ -123,7 +123,7 @@ int wt_thd_will_wait_for(WT_THD *, WT_THD *, const WT_RESOURCE_ID *);
 int wt_thd_cond_timedwait(WT_THD *, pthread_mutex_t *);
 void wt_thd_release(WT_THD *, const WT_RESOURCE_ID *);
 #define wt_thd_release_all(THD) wt_thd_release((THD), 0)
-int wt_resource_id_memcmp(const void *, const void *);
+my_bool wt_resource_id_memcmp(const void *, const void *);
 
 C_MODE_END
 
diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c
index 5b99a5ceeba..732929f6d99 100644
--- a/mysys/waiting_threads.c
+++ b/mysys/waiting_threads.c
@@ -545,7 +545,7 @@ void wt_thd_destroy(WT_THD *thd)
   It can be used in WT_RESOURCE_TYPE structures where bytewise
   comparison of values is sufficient.
 */
-int wt_resource_id_memcmp(const void *a, const void *b)
+my_bool wt_resource_id_memcmp(const void *a, const void *b)
 {
   /* we use the fact that there's no padding in the middle of WT_RESOURCE_ID */
   compile_time_assert(offsetof(WT_RESOURCE_ID, type) == sizeof(ulonglong));
diff --git a/unittest/mysys/waiting_threads-t.c b/unittest/mysys/waiting_threads-t.c
index 157835087b5..74c18fda7b9 100644
--- a/unittest/mysys/waiting_threads-t.c
+++ b/unittest/mysys/waiting_threads-t.c
@@ -262,7 +262,9 @@ void do_tests()
     wt_thd_release_all(& thds[cnt].thd);
     wt_thd_destroy(& thds[cnt].thd);
     pthread_mutex_destroy(& thds[cnt].lock);
+#ifndef DBUG_OFF
     free(thds[cnt].thd.name);
+#endif
   }
   pthread_mutex_unlock(&lock);
   wt_end();