maria-developers team mailing list archive

[Igor Babaev <igor@xxxxxxxxxxxx>]

#At lp:maria based on revid:igor@xxxxxxxxxxxx-20090920030226-xxh7a4i3gre9rqhe

 2754 Igor Babaev	2009-09-24
      Took care of mysql test suite failures on Windows.
modified:
  mysql-test/suite/rpl/t/rpl_binlog_corruption.test
  mysql-test/suite/rpl/t/rpl_killed_ddl.test
  vio/viosocket.c

per-file messages:
  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.
=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_corruption.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_corruption.test	2009-04-15 11:43:17 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_corruption.test	2009-09-25 06:42:43 +0000
@@ -15,6 +15,9 @@
 # BUG#31793: log event corruption causes crash
 # 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;
 # BUG#40482 only manifested itself in debug-compiled binaries.
 source include/have_debug.inc;

=== modified file 'mysql-test/suite/rpl/t/rpl_killed_ddl.test'
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test	2009-04-08 23:42:51 +0000
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test	2009-09-25 06:42:43 +0000
@@ -31,6 +31,9 @@
 #  - BUG#25705
 #  - BUG#44171
 
+# Temporarily disabled on Windows due to bug #47638 
+--source include/not_windows.inc
+
 source include/have_debug.inc;
 source include/master-slave.inc;
 

=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2009-09-07 20:50:10 +0000
+++ b/vio/viosocket.c	2009-09-25 06:42:43 +0000
@@ -361,7 +361,20 @@ void vio_in_addr(Vio *vio, struct in_add
 my_bool vio_poll_read(Vio *vio,uint timeout)
 {
 #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;
+#endif
 #else
   struct pollfd fds;
   int res;