unknown 8dc5c95b14 Merge mysql.com:/home/jimw/my/mysql-4.1-clean ... into mysql.com:/home/jimw/my/mysql-5.0-clean include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/violite.h: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql-common/client.c: Auto merged sql/examples/ha_archive.cc: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged configure.in: Resolve conflicts		2005-09-12 17:00:50 -07:00
..
docs	Fixed searching after ssl directories.	2002-09-05 16:17:08 +03:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
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	After merge fixes	2004-12-31 00:44:00 +02:00
vio.c	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-09-12 17:00:50 -07:00
vio_priv.h	Fixes bug #5588. Additions after merge from 4.0.	2005-09-07 15:57:14 +04:00
viosocket.c	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-09-12 17:00:50 -07:00
viossl.c	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-09-12 17:00:50 -07:00
viosslfactories.c	Bug #11286 yassl incompatible with "load data infile"	2005-09-01 11:46:43 +02:00
viotest-ssl.c	Fixes for Netware	2003-01-28 08:38:28 +02:00
viotest-sslconnect.cc	Fixed for Ia64 + delayed key creation + a lot of small bug fixes	2000-08-15 20:09:37 +03:00
viotest.cc	Fixed for Ia64 + delayed key creation + a lot of small bug fixes	2000-08-15 20:09:37 +03:00