summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <hhunger@hh-nb.hungers>2008-04-10 18:32:37 +0200
committerunknown <hhunger@hh-nb.hungers>2008-04-10 18:32:37 +0200
commit3828535bbef1c3f73fa9c42a2a63556c841b70db (patch)
tree8a064effb7b691f1c36e8f3dc10e95181c016e3e /.bzrignore
parentec63ce25294e38a8ad581b72b1da83d48235d9e3 (diff)
parentb00c536378b56f06d4d721d975161506e7e0cf2a (diff)
downloadmariadb-git-3828535bbef1c3f73fa9c42a2a63556c841b70db.tar.gz
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build BitKeeper/etc/ignore: auto-union
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 25af8360a83..34980e4ae00 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1287,6 +1287,8 @@ mysql-test/funcs_1.tar
mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/lib/init_db.sql
+mysql-test/linux_sys_vars.inc
+mysql-test/load_sysvars.inc
mysql-test/mtr
mysql-test/mysql-test-run
mysql-test/mysql-test-run-shell
@@ -1399,6 +1401,7 @@ mysql-test/t/index_merge.load
mysql-test/t/tmp.test
mysql-test/var
mysql-test/var/*
+mysql-test/windows_sys_vars.inc
mysql.kdevprj
mysql.proj
mysql_priv.h