Commit d210e5fd authored by Igor Babaev's avatar Igor Babaev

Took care of mysql test suite failures on Windows.

mysql-test/suite/rpl/t/rpl_binlog_corruption.test:
  Disabled the test for Windows (see bug #47639)
mysql-test/suite/rpl/t/rpl_killed_ddl.test:
  Disabled the test for Windows (see bug #47638)
vio/viosocket.c:
  Added an implementation of vio_poll_read for Windows.
  Winsock does not support the poll function.
  So the existing generic implementation of vio_poll_read
  could not be used for Windows.
parent cb4121f2
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
# BUG#31793: log event corruption causes crash # BUG#31793: log event corruption causes crash
# BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event # BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event
# Temporarily disabled on Windows due to bug #47639
--source include/not_windows.inc
source include/have_log_bin.inc; source include/have_log_bin.inc;
# BUG#40482 only manifested itself in debug-compiled binaries. # BUG#40482 only manifested itself in debug-compiled binaries.
source include/have_debug.inc; source include/have_debug.inc;
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
# - BUG#25705 # - BUG#25705
# - BUG#44171 # - BUG#44171
# Temporarily disabled on Windows due to bug #47638
--source include/not_windows.inc
source include/have_debug.inc; source include/have_debug.inc;
source include/master-slave.inc; source include/master-slave.inc;
......
...@@ -361,7 +361,20 @@ void vio_in_addr(Vio *vio, struct in_addr *in) ...@@ -361,7 +361,20 @@ void vio_in_addr(Vio *vio, struct in_addr *in)
my_bool vio_poll_read(Vio *vio,uint timeout) my_bool vio_poll_read(Vio *vio,uint timeout)
{ {
#ifndef HAVE_POLL #ifndef HAVE_POLL
#if __WIN__
int res;
struct fd_set fds;
struct timeval tv;
DBUG_ENTER("vio_poll");
fds.fd_count= 1;
fds.fd_array[0]= vio->sd;
tv.tv_sec= timeout;
tv.tv_usec= 0;
res= select(1, &fds, NULL, NULL, &tv) ? 0 : 1;
DBUG_RETURN(res);
#else
return 0; return 0;
#endif
#else #else
struct pollfd fds; struct pollfd fds;
int res; int res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment