summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-05-20 11:13:07 +0200
committerSergei Golubchik <sergii@pisem.net>2013-05-20 11:13:07 +0200
commit639a766096733861ce5f4ed4863d9db37090a4f4 (patch)
tree03c798fe41698e07f03d7db63ac54e4707c3ebaa /.bzrignore
parent682c8a36ca503f53db50628463424f205b609ab0 (diff)
parent4ee5ae3e7ff418d8912920357427297f1465f407 (diff)
downloadmariadb-git-639a766096733861ce5f4ed4863d9db37090a4f4.tar.gz
5.2 merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore7
1 files changed, 1 insertions, 6 deletions
diff --git a/.bzrignore b/.bzrignore
index d1786cefa90..7106965ec24 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -41,12 +41,9 @@
*.vcproj
*.vcproj.cmake
*.dsp
-*.Po
-*.Plo
*.vcxproj
*.vcxproj.filters
*/*.dir/*
-*.dir
Debug
MySql.sdf
Win32
@@ -1917,7 +1914,6 @@ mysql-test/bug36522.tar
mysql-test/t.log
mysql-test/tps.log
libmysqld/event_parse_data.cc
-autom4te.cache
sql/share/czech
sql/share/danish
sql/share/dutch
@@ -1972,8 +1968,6 @@ storage/maria/aria_log_control
scripts/mytop
CPackConfig.cmake
CPackSourceConfig.cmake
-win/nmake_cache.txt
-*.manifest
*.resource.txt
plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.c
plugin/handler_socket/perl-Net-HandlerSocket/blib
@@ -1983,3 +1977,4 @@ plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL
libmysqld/gcalc_slicescan.cc
libmysqld/gcalc_tools.cc
sql-bench/test-table-elimination
+sql/sql_yacc.hh