Skip to content

Commit ad5b88a

Browse files
committed
Fix build error in XtraDB on Windows.
coming from Percona's workaround for glibc bug http://bugs.mysql.com/bug.php?id=82886
1 parent bd4568a commit ad5b88a

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

storage/xtradb/os/os0thread.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,19 @@ void
220220
os_thread_join(
221221
os_thread_t thread)
222222
{
223+
/*This function is currently only used to workaround glibc bug
224+
described in http://bugs.mysql.com/bug.php?id=82886
225+
226+
On Windows, no workarounds are necessary, all threads
227+
are "detached" upon thread exit (handle is closed), so we do
228+
nothing.
229+
*/
230+
#ifndef _WIN32
223231
int ret MY_ATTRIBUTE((unused)) = pthread_join(thread, NULL);
224232

225233
/* Waiting on already-quit threads is allowed */
226234
ut_ad(ret == 0 || ret == ESRCH);
235+
#endif
227236
}
228237

229238
/*****************************************************************//**

0 commit comments

Comments
 (0)