Merge pull request #753 from shinnok/10.3-macfixes

MDEV-15778: 10.3 macOS build fixes
MariaDB · May 15, 2018 · a004837 · a004837
2 parents 9ee5406 + 6620fbd
commit a004837
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h
@@ -50,7 +50,7 @@ class MutexDebug {
 			m_mutex(),
 			m_filename(),
 			m_line(),
-			m_thread_id(os_thread_id_t(ULINT_UNDEFINED))
+			m_thread_id(ULINT_UNDEFINED)
 		{
 			/* No op */
 		}
@@ -76,7 +76,7 @@ class MutexDebug {
 		{
 			m_mutex = mutex;
 
-			my_atomic_storelint(&m_thread_id, os_thread_get_curr_id());
+			my_atomic_storelint(&m_thread_id, reinterpret_cast<ulint>(os_thread_get_curr_id()));
 
 			m_filename = filename;
 

diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
@@ -210,7 +210,7 @@ MYSQL_ADD_EXECUTABLE(sst_dump rocksdb/tools/sst_dump.cc COMPONENT rocksdb-engine
 TARGET_LINK_LIBRARIES(sst_dump rocksdblib)
 
 MYSQL_ADD_EXECUTABLE(mysql_ldb tools/mysql_ldb.cc COMPONENT rocksdb-engine)
-TARGET_LINK_LIBRARIES(mysql_ldb rocksdb_tools rocksdb_aux_lib)
+TARGET_LINK_LIBRARIES(mysql_ldb rocksdb_tools rocksdb_aux_lib dbug)
 
 INSTALL_SCRIPT(myrocks_hotbackup COMPONENT rocksdb-engine)