diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-28 11:36:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-28 11:36:10 +0200 |
| commit | 68eeedfded852571956c5e53c915262611f96130 (patch) | |
| tree | 6ce91c985062eebf9bc909aa7eb52f1b359fcaa0 /vio/test-ssl.c | |
| parent | f13905e1e97167c4d01ab99866d6addbb2fb2d85 (diff) | |
| parent | 484069cf00ea15e3b690228ddf81752704fac390 (diff) | |
| download | mariadb-git-68eeedfded852571956c5e53c915262611f96130.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
vio/viossl.c:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Merge 5.0->5.1
Diffstat (limited to 'vio/test-ssl.c')
0 files changed, 0 insertions, 0 deletions