diff options
author | unknown <monty@narttu.mysql.fi> | 2003-06-14 11:38:09 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-06-14 11:38:09 +0300 |
commit | 6481edae4d53eed163554aff7de95c096e8d8d87 (patch) | |
tree | 5d9a3e6d59737b598df1ee081219ed64898d0aeb /SSL | |
parent | fd37c0be4d8354b54dbad4aa14a80ccdaa2836d4 (diff) | |
parent | cb9dfd2a3aa3c74508a1548fe73b296e21e9857f (diff) | |
download | mariadb-git-6481edae4d53eed163554aff7de95c096e8d8d87.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
client/mysql.cc:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'SSL')
0 files changed, 0 insertions, 0 deletions