mariadb/vio
unknown 8daa1c4229 Merge mysql.com:/home/bkroot/mysql-4.1
into  mysql.com:/home/bk/mysql-5.0


BitKeeper/etc/config:
  Auto merged
include/my_global.h:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
sql/log.cc:
  Manual merge
sql/slave.cc:
  Manual merge
2005-07-13 02:13:04 +02:00
..
docs
.cvsignore
Makefile.am Merge 2005-07-06 00:06:11 +02:00
test-ssl.c Fedora now defines read(2)/write(2) as macros. 2005-03-29 23:31:56 +02:00
test-sslclient.c Fedora now defines read(2)/write(2) as macros. 2005-03-29 23:31:56 +02:00
test-sslserver.c
vio.c Merge mysql.com:/home/bkroot/mysql-4.1 2005-07-13 02:13:04 +02:00
vio_priv.h Bug #9721 net_write_timeout not used on Windows 2005-05-05 17:17:57 +02:00
viosocket.c Merge mysql.com:/home/bkroot/mysql-4.1 2005-07-13 02:13:04 +02:00
viossl.c Merge mysql.com:/usr/home/bar/mysql-4.1 2005-07-12 13:18:25 +05:00
viosslfactories.c
viotest-ssl.c
viotest-sslconnect.cc
viotest.cc