summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2007-02-23 13:28:34 +0200
committermonty@narttu.mysql.fi <>2007-02-23 13:28:34 +0200
commit6d78655a97a42626dd05555f8a6780fa927a0ee4 (patch)
treee51e858842dd4e5dfcd041d6825807ca53283ec4 /.bzrignore
parentf0ae3ce9b97f45b717201764c6af6e4bd4176e5c (diff)
parent8f4fef291d16463bb3e76a437c4ed7badac1a5d6 (diff)
downloadmariadb-git-6d78655a97a42626dd05555f8a6780fa927a0ee4.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index f9f43b1c82d..9f59f057f4f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2664,6 +2664,7 @@ storage/ndb/src/mgmclient/test_cpcd/*.d
storage/ndb/src/mgmsrv/ndb_mgmd
storage/ndb/src/mgmsrv/ndb_mgmd.dsp
storage/ndb/src/ndbapi/libndbapi.dsp
+storage/ndb/src/ndbapi/ndberror_check
storage/ndb/test/ndbapi/DbAsyncGenerator
storage/ndb/test/ndbapi/DbCreate
storage/ndb/test/ndbapi/bank/bankCreator
@@ -2951,4 +2952,3 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
-storage/ndb/src/ndbapi/ndberror_check