summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-06 11:38:56 +0200
committermonty@mysql.com <>2004-12-06 11:38:56 +0200
commit0de4777187a869b4a070ba1e0da28a2ffe1abf05 (patch)
treea7bb331b7dac7ac2b3cda915e99bb8c1333f4fec /.bzrignore
parent86508ad9690c61e806acf308b57c6431b1a2dd99 (diff)
parentdededf09fa8cb1096549e74f543c84b81e413066 (diff)
downloadmariadb-git-0de4777187a869b4a070ba1e0da28a2ffe1abf05.tar.gz
Merge with 4.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 2893e947cf8..f675b1a9e5a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -387,7 +387,9 @@ libmysqld/field_conv.cc
libmysqld/filesort.cc
libmysqld/get_password.c
libmysqld/gstream.cc
+libmysqld/ha_archive.cc
libmysqld/ha_berkeley.cc
+libmysqld/ha_example.cc
libmysqld/ha_heap.cc
libmysqld/ha_innobase.cc
libmysqld/ha_innodb.cc
@@ -395,6 +397,7 @@ libmysqld/ha_isam.cc
libmysqld/ha_isammrg.cc
libmysqld/ha_myisam.cc
libmysqld/ha_myisammrg.cc
+libmysqld/ha_tina.cc
libmysqld/handler.cc
libmysqld/hash_filo.cc
libmysqld/hostname.cc