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

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

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_priv.h

Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

2005-11-21 16:09:26 +04:00

vio.c

Merge mysql.com:/opt/local/work/mysql-4.1-root

2005-11-25 13:57:13 +03:00

viosocket.c

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

2005-10-13 18:23:53 +03: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