summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-07-31 22:59:55 +0200
committerunknown <knielsen@knielsen-hq.org>2011-07-31 22:59:55 +0200
commitefcb48f23e4642736d1394feb39071e3664d72b5 (patch)
tree185421818340b0edd20cf226d42438d9c78963de /.bzrignore
parent103c4461ca5dfa85516652afd195c75ab69b1db7 (diff)
parent0b56ae29bf6dbcc1082a497477719d51266a6198 (diff)
downloadmariadb-git-efcb48f23e4642736d1394feb39071e3664d72b5.tar.gz
Automerge 5.2->5.3
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 7d31b66867c..720918c46a8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1969,4 +1969,5 @@ plugin/handler_socket/client/hsclient
client/strings_def.h
libmysql/strings_def.h
libmysql_r/strings_def.h
+storage/maria/aria_log_control
scripts/mytop