unknown f6ffd3a18a 5.0 -> 5.1 merge ... configure.in: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/r/query_cache_notembedded.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/query_cache_notembedded.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged sql/ha_innodb.cc: manual merge sql/sql_insert.cc: manual merge		2006-03-21 16:26:47 +04: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
cmakelists.txt	Moved cmake scripts into the proper directories	2006-03-15 10:22:12 -06:00
Makefile.am	Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking	2005-10-18 15:43:59 +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:/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	No longer leak file descriptors in mysql_close. Fixes Bug#15846.	2006-03-17 18:46:34 +01:00
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	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