diff options
author | unknown <msvensson@pilot.(none)> | 2007-06-19 11:07:39 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-06-19 11:07:39 +0200 |
commit | 8d04d7bba13dd113cac834b3d3fa6f782ed96123 (patch) | |
tree | d9577b4c787cd68197015fde0ec633c1eedbc388 /SSL | |
parent | 9cb0a84c7e475302350d64ffd33cb8e61a25737e (diff) | |
parent | 9aac6fd7bd5be2e77694bc4e438ff12e862067f0 (diff) | |
download | mariadb-git-8d04d7bba13dd113cac834b3d3fa6f782ed96123.tar.gz |
Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232
into pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'SSL')
0 files changed, 0 insertions, 0 deletions