summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-06-30 20:07:33 +0300
committermonty@mysql.com <>2006-06-30 20:07:33 +0300
commitf62829636b5bdec183610acfba53ca18e0dd2f98 (patch)
treeda64f683229006c098861b31377eeea29039ae5c /.bzrignore
parent2f86009c9e8d7a59385981f311286e616a4b41aa (diff)
downloadmariadb-git-f62829636b5bdec183610acfba53ca18e0dd2f98.tar.gz
After merge fixes
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index ef02a085144..7ea7f1ab7e2 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1286,3 +1286,5 @@ vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
BitKeeper/etc/RESYNC_TREE
+mysql-test/r/*.log
+scripts/mysql_upgrade_shell