summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authordf@pippilotta.erinye.com <>2007-08-03 17:15:23 +0200
committerdf@pippilotta.erinye.com <>2007-08-03 17:15:23 +0200
commit493634e4c7010ae6e7974c5104ebde8c8adf949d (patch)
tree41392b6e41e1b68bd6aeb6fb0853704e5a98ce3a /.bzrignore
parent3d986fde8d352e83a6dac2292e52d1d71ee5e2b5 (diff)
parent113cd2d064e500cd3241046ab374c490d95dace8 (diff)
downloadmariadb-git-493634e4c7010ae6e7974c5104ebde8c8adf949d.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-marvel
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index d44aefea583..af4feb9a5b8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2882,6 +2882,7 @@ support-files/mysql-3.23.29-gamma.spec
support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
+support-files/mysqld_multi.server
support-files/ndb-config-2-node.ini
tags
test/ndbapi/bank/bankCreator
@@ -2947,6 +2948,7 @@ tests/.deps/thread_test.Po
tests/.libs -prune
tests/.libs/lt-mysql_client_test
tests/.libs/mysql_client_test
+tests/bug25714
tests/client_test
tests/connect_test
tests/mysql_client_test