mariadb/vio
unknown f6895c6dfd Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
sql/slave.cc:
  Auto merged
vio/viossl.c:
  SCCS merged
2007-07-12 22:22:40 -04:00
..
docs
.cvsignore
CMakeLists.txt
Makefile.am
test-ssl.c
test-sslclient.c
test-sslserver.c
vio.c
vio_priv.h Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 2007-06-05 17:51:30 +02:00
viosocket.c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 2007-06-05 17:51:30 +02:00
viossl.c Merge damien-katzs-computer.local:/Users/dkatz/mysql50 2007-07-12 22:22:40 -04:00
viosslfactories.c
viotest-ssl.c
viotest-sslconnect.cc
viotest.cc