summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@nosik.monty.fi <>2007-08-02 07:55:33 +0300
committermonty@nosik.monty.fi <>2007-08-02 07:55:33 +0300
commit93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d (patch)
tree5c544cc45c47bbd06c8b4d216aab02fe9307f8de /.bzrignore
parent2459558060cbc959ffa4b487a1db323bf4f384cd (diff)
parent4f33d95fa3be042234a2cc8e351bdf52cea3376d (diff)
downloadmariadb-git-93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 329c5e227ca..fdcbc3b262b 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2995,3 +2995,4 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
+support-files/mysqld_multi.server