mariadb/vio
unknown d9d1337e2e Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict
2005-11-29 15:33:58 -08:00
..
docs
.cvsignore
Makefile.am Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking 2005-10-18 15:43:59 +02:00
test-ssl.c
test-sslclient.c
test-sslserver.c
vio.c Merge mysql.com:/opt/local/work/mysql-4.1-root 2005-11-25 13:57:13 +03:00
vio_priv.h Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled 2005-11-21 16:09:26 +04:00
viosocket.c
viossl.c Merge mysql.com:/opt/local/work/mysql-4.1-root 2005-11-25 13:57:13 +03:00
viosslfactories.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-11-29 15:33:58 -08:00
viotest-ssl.c
viotest-sslconnect.cc
viotest.cc