summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-10-06 11:03:37 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-10-06 11:03:37 +0400
commit30df032e28bada8aabc1c850799795c728cd96b7 (patch)
tree4d7d8b6e481197bcd1cf04368d7c19316b047527 /.bzrignore
parent79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff)
parent4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff)
downloadmariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz
SHOW EXPLAIN: merge with 5.5-main
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 74c81c48e05..dedd26a8fb9 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1136,6 +1136,7 @@ plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL
libmysqld/libmysqld_exports_file.cc
libmysqld/gcalc_slicescan.cc
libmysqld/gcalc_tools.cc
+libmysqld/my_apc.cc
sql/share/errmsg.sys
sql/share/mysql
install_manifest.txt