summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorjpipes@shakedown.(none) <>2006-11-27 14:58:57 -0500
committerjpipes@shakedown.(none) <>2006-11-27 14:58:57 -0500
commit03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20 (patch)
tree8000ea4cede29d098cc2e485d08d1f337ec4fa9f /.bzrignore
parent699898c82c34a273721e54b1eaac24e75acd2e2c (diff)
parentb57051381a4dbd7c7f933b28582c496047e2f139 (diff)
downloadmariadb-git-03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index e167619c1a6..a8e964fd0c3 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -334,6 +334,7 @@ client/sql_string.cpp
client/ssl_test
client/thimble
client/thread_test
+client/tmp.diff
client_debug/*
client_release/*
client_test
@@ -762,10 +763,12 @@ mysql-test/r/rpl000016.eval
mysql-test/r/rpl_log.eval
mysql-test/r/slave-running.eval
mysql-test/r/slave-stopped.eval
+mysql-test/r/tmp.result
mysql-test/r/udf.log
mysql-test/share/mysql
mysql-test/std_data/*.pem
mysql-test/t/index_merge.load
+mysql-test/t/tmp.test
mysql-test/var
mysql-test/var/*
mysql.kdevprj