summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-03 19:17:05 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-03 19:17:05 +0100
commit0e007344eae972b9be7d88ca43373cb33662ac1c (patch)
tree7b3561cb3ea2ad24d013e847680ec165f406387e /.bzrignore
parent3794110f0215f0631107c2694dc0f1675a4bb520 (diff)
parent681476255147dacac7e3674b6cd2ae770fee2208 (diff)
downloadmariadb-git-0e007344eae972b9be7d88ca43373cb33662ac1c.tar.gz
mysql-5.5.18 merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index 0d70e0375e1..1c9bb50e800 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -145,8 +145,6 @@ COPYING
COPYING.LIB
core
core.*
-CPackConfig.cmake
-CPackSourceConfig.cmake
cscope.in.out
cscope.out
cscope.po.out
@@ -1098,6 +1096,8 @@ sql/share/slovak
sql/share/spanish
sql/share/swedish
sql/share/ukrainian
+CPackConfig.cmake
+CPackSourceConfig.cmake
Docs/INFO_BIN
Docs/INFO_SRC
tags
@@ -1131,3 +1131,6 @@ storage/maria/aria_log_control
scripts/mytop
include/*.h.tmp
cmd-line-utils/libedit/emacs.h
+mysql-test/collections/default.release
+support-files/plugins.files
+client/mysql_plugin