diff options
| author | unknown <guilhem@mysql.com> | 2004-07-29 23:28:28 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-07-29 23:28:28 +0200 |
| commit | 2be153efbefb0b37d45440a8a3fce2e61632a999 (patch) | |
| tree | 48229c969d00cb768a0fdaf0a6be2bcd0b371cbf /mysql-test/r/openssl_1.result | |
| parent | 2d2cf95ee3c74e9bb2fa5c881ba537bf06fabde3 (diff) | |
| parent | 88e3aead85b7136fab3d8cfcfa19174c4c2e2662 (diff) | |
| download | mariadb-git-2be153efbefb0b37d45440a8a3fce2e61632a999.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
client/mysqlbinlog.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'mysql-test/r/openssl_1.result')
0 files changed, 0 insertions, 0 deletions