summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-06-11 15:07:43 +0300
committerunknown <monty@hundin.mysql.fi>2001-06-11 15:07:43 +0300
commit8b76fb7f3ef18727fcc1b06733fd190a0741a321 (patch)
tree7a4dfcffeed3cfda1da5e12ef7c4019aa5993c9f /.bzrignore
parent036396bc666abaa317dfd3cc700fc5fe77db9cc4 (diff)
parent44b670f650dbcac6426f635caefeb15851614842 (diff)
downloadmariadb-git-8b76fb7f3ef18727fcc1b06733fd190a0741a321.tar.gz
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted Docs/manual.texi: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore6
1 files changed, 4 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index b160b186fba..e49294554cb 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -237,11 +237,15 @@ scripts/safe_mysqld
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
sql-bench/bench-init.pl
sql-bench/compare-results
+sql-bench/compare-results-all
sql-bench/copy-db
sql-bench/crash-me
+sql-bench/gif/*
+sql-bench/graph-compare-results
sql-bench/output/*
sql-bench/run-all-tests
sql-bench/server-cfg
+sql-bench/template.html
sql-bench/test-ATIS
sql-bench/test-alter-table
sql-bench/test-big-tables
@@ -283,5 +287,3 @@ support-files/mysql.server
support-files/mysql.spec
tags
tmp/*
-sql-bench/gif/*
-sql-bench/graph-compare-results