summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormsvensson@pilot.mysql.com <>2007-02-13 10:00:53 +0100
committermsvensson@pilot.mysql.com <>2007-02-13 10:00:53 +0100
commit7dcdbdf37bb391df0b16d377550e70253196931f (patch)
treed4957aedf39f381beff303c1a7bc5ddd2de6621e /.bzrignore
parent818cb094fc43495f8b6e342ff8300796d8458078 (diff)
parent7a87a3c41672ae4966e907b09a4341c817054397 (diff)
downloadmariadb-git-7dcdbdf37bb391df0b16d377550e70253196931f.tar.gz
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 9e1ff120a6c..ac692af1db1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -698,6 +698,7 @@ mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/mtr
mysql-test/mysql-test-run
+mysql-test/mysql-test-run-shell
mysql-test/mysql-test-run.log
mysql-test/mysql_test_run_new
mysql-test/ndb/ndbcluster
@@ -967,6 +968,7 @@ ndb/src/kernel/error/liberror.dsp
ndb/src/kernel/ndbd
ndb/src/kernel/ndbd.dsp
ndb/src/kernel/vm/libkernel.dsp
+ndb/src/libndb.ver
ndb/src/libndbclient.dsp
ndb/src/mgmapi/libmgmapi.dsp
ndb/src/mgmclient/libndbmgmclient.dsp
@@ -1333,4 +1335,3 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
-ndb/src/libndb.ver