summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-01-14 14:33:10 +0200
committerunknown <monty@mashka.mysql.fi>2003-01-14 14:33:10 +0200
commit8b255948974868d0c5281ab81e17e789c7a0894f (patch)
tree8f1edd80f0db85355e2e19efd0034796b55cb32e /.bzrignore
parent50989ef2032201d2f969082196d546f8a04368b5 (diff)
parent910c125bb6528b08f7c30b7b75650076b7b953fe (diff)
downloadmariadb-git-8b255948974868d0c5281ab81e17e789c7a0894f.tar.gz
merge
BitKeeper/etc/ignore: added extra/mysql_waitpid include/m_ctype.h: Auto merged libmysql/Makefile.shared: Auto merged mysql-test/r/create.result: Auto merged sql/item_strfunc.cc: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 379f5401021..17fee4a6fc1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -581,3 +581,4 @@ vio/test-sslserver
vio/viotest-ssl
libmysqld/protocol.cc
test_xml
+extra/mysql_waitpid