summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-06-01 21:52:20 +0200
committerSergei Golubchik <sergii@pisem.net>2010-06-01 21:52:20 +0200
commitffc8f62b08982cc1f2fabf8b4b38bd124c115a97 (patch)
treeda42637b1ae9402a7436b715f9c0db57cdddc87a /.bzrignore
parent6b157f6be3cb056a93eb925df3880098c871b32a (diff)
parent0fc39acb8125fae95062e7b680b022b075a308c3 (diff)
downloadmariadb-git-ffc8f62b08982cc1f2fabf8b4b38bd124c115a97.tar.gz
merge 5.1->5.2
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index e2d1b9633db..9907f5b4e12 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1935,3 +1935,4 @@ libmysqld/client_plugin.c
sql/client_plugin.c
*.dgcov
libmysqld/create_options.cc
+storage/pbxt/bin/xtstat