summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorbrian@avenger.(none) <>2004-11-11 18:58:57 -0800
committerbrian@avenger.(none) <>2004-11-11 18:58:57 -0800
commitf05daf02ba845b820d6a817c9e2058654b4a764b (patch)
tree46fde821aa292e663e9f48d37f44657e025a1271 /.bzrignore
parent7073829fbb3515edca83a87dbfd428c88f47a3e0 (diff)
parent6f39bf2b9c31f78ef6940dacb81e80d6772640b9 (diff)
downloadmariadb-git-f05daf02ba845b820d6a817c9e2058654b4a764b.tar.gz
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 0e071d1343e..0ed7e966dcc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -742,6 +742,7 @@ ndb/tools/ndb_drop_table
ndb/tools/ndb_select_all
ndb/tools/ndb_select_count
ndb/tools/ndb_show_tables
+ndb/tools/ndb_test_platform
ndb/tools/ndb_waiter
pull.log
regex/re