summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorhhunger@hh-nb.hungers <>2008-04-10 18:32:37 +0200
committerhhunger@hh-nb.hungers <>2008-04-10 18:32:37 +0200
commit88451eacfd9882f161abf1f76bbf6f20a9c79499 (patch)
tree8a064effb7b691f1c36e8f3dc10e95181c016e3e /.bzrignore
parent7a4136604a0375c0f3844276dad4e3c1b026f04b (diff)
parentafd90d6166ed9ceac87afadcad056a58b334ad63 (diff)
downloadmariadb-git-88451eacfd9882f161abf1f76bbf6f20a9c79499.tar.gz
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build
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