Commit e25d18d1 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/t/rpl_openssl.test:
  Auto merged
parents b34ceb82 acecd1ca
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
# TODO: THIS TEST DOES NOT WORK ON WINDOWS
#       This should be fixed.
--source include/not_windows.inc

source include/have_openssl.inc;
source include/master-slave.inc;