diff options
author | unknown <monty@hundin.mysql.fi> | 2001-09-15 16:24:05 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-09-15 16:24:05 +0300 |
commit | b7ae610302c4355bd99981ad59ebd0291638b3ca (patch) | |
tree | 283613d1cbe615aa39ecd68431356f0e17f4b8a5 /.bzrignore | |
parent | 3c360e3ea510c916d0ebda3fbcded31d010d6e6d (diff) | |
parent | 7dc2f1a69e61a4370ae06edc77de0fd5bf98e6fb (diff) | |
download | mariadb-git-b7ae610302c4355bd99981ad59ebd0291638b3ca.tar.gz |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore:
added vio/test-ssl
sql/net_serv.cc:
Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index fa75e6a1f02..404de44a8f8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -400,3 +400,4 @@ vio/test-sslserver vio/viotest-ssl tools/mysqlmanager vio/test-ssl +vio/test-ssl |