summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-22 18:04:38 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-22 18:04:38 +0100
commitd2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch)
treec6e4678908c750d7f558e98cedc349aa1d350892 /.bzrignore
parentaf32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff)
parent42221abaed700f6dc5d280b462755851780e8487 (diff)
downloadmariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz
5.3->5.5 merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore12
1 files changed, 5 insertions, 7 deletions
diff --git a/.bzrignore b/.bzrignore
index 1c9bb50e800..a2947f9afe3 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -477,8 +477,6 @@ ma_test_recovery.output
make_dist.cmake
Makefile
Makefile.in
-maria_log.00000*
-maria_log_control
MinSizeRel/
MIRRORS
missing
@@ -1065,10 +1063,6 @@ vio/test-sslserver
vio/viotest-ssl
vio/viotest-sslconnect.cpp
vio/viotest.cpp
-win/configure.data
-win/vs71cache.txt
-win/vs8cache.txt
-win/nmake_cache.txt
ylwrap
zlib/*.ds?
sql-bench/test-table-elimination
@@ -1123,7 +1117,6 @@ storage/pbxt/bin/xtstat
libmysqld/sql_expression_cache.cc
mysql-test/mtr_command
scripts/convert-debug-for-diff
-plugin/handler_socket/client/hsclient
client/strings_def.h
libmysql/strings_def.h
libmysql_r/strings_def.h
@@ -1134,3 +1127,8 @@ cmd-line-utils/libedit/emacs.h
mysql-test/collections/default.release
support-files/plugins.files
client/mysql_plugin
+plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.c
+plugin/handler_socket/perl-Net-HandlerSocket/blib
+plugin/handler_socket/perl-Net-HandlerSocket/pm_to_blib
+plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.bs
+plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL