diff options
| author | unknown <cmiller@zippy.(none)> | 2006-06-20 17:17:04 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-06-20 17:17:04 -0400 |
| commit | b1bee755a0b5538ed7bd64cf18e934c47cd1b192 (patch) | |
| tree | e00305ac71067ad01c53c30eeb4904036cd3351a /.bzrignore | |
| parent | 0f6a24ad6c0c5caef0101c56ad1a6c2313d103d6 (diff) | |
| parent | f77b80a8466bd3384b09bba90e96f396aa72598a (diff) | |
| download | mariadb-git-b1bee755a0b5538ed7bd64cf18e934c47cd1b192.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
client/mysqldump.c:
Auto merged
BitKeeper/etc/ignore:
Added BitKeeper/etc/RESYNC_TREE to the ignore list
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index eafc384fda5..ef02a085144 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1285,3 +1285,4 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj +BitKeeper/etc/RESYNC_TREE |