Avoid thread blocking on Ruby 1.9.x under Windows. Closes #142

Author: luislavena

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## In Git
+* Avoid thread blocking on Ruby 1.9.x under Windows. Patch by Roger Pack.
+
 ## 0.3.2 (April 26th, 2011)
 * Fix typo in initialization for older ActiveRecord versions
 

ext/mysql2/client.c

@@ -380,7 +380,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
     for(;;) {
       int fd_set_fd = fd;
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(HAVE_RB_THREAD_BLOCKING_REGION)
       WSAPROTOCOL_INFO wsa_pi;
       // dupicate the SOCKET from libmysql
       int r = WSADuplicateSocket(fd, GetCurrentProcessId(), &wsa_pi);
@@ -394,7 +394,7 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
 
       retval = rb_thread_select(fd_set_fd + 1, &fdset, NULL, NULL, tvp);
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(HAVE_RB_THREAD_BLOCKING_REGION)
       // cleanup the CRT fd
       _close(fd_set_fd);
       // cleanup the duplicated SOCKET