summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authoriggy@amd64.(none) <>2007-08-03 21:44:59 -0400
committeriggy@amd64.(none) <>2007-08-03 21:44:59 -0400
commit64b6c611081e4a2cc10272888a2ba987dcecb188 (patch)
tree8a56836c31dc997c4350174acfc4c641d741f298 /.bzrignore
parentdb15f4daebe6cbdc27990182f1a1c000bc80769a (diff)
parent171f402ad448c92dc76ed38a52008de1e6a351ac (diff)
downloadmariadb-git-64b6c611081e4a2cc10272888a2ba987dcecb188.tar.gz
Merge amd64.(none):/src/mysql-5.1-maint
into amd64.(none):/src/mysql-5.1-build_29903
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index af4feb9a5b8..c38cb22d0fd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1099,6 +1099,7 @@ libmysqld/item_sum.cc
libmysqld/item_timefunc.cc
libmysqld/item_uniq.cc
libmysqld/key.cc
+libmysqld/lex_hash.h
libmysqld/lib_sql.cpp
libmysqld/libmysql.c
libmysqld/link_sources
@@ -1107,6 +1108,8 @@ libmysqld/log.cc
libmysqld/log_event.cc
libmysqld/log_event_old.cc
libmysqld/md5.c
+libmysqld/message.h
+libmysqld/message.rc
libmysqld/mf_iocache.cc
libmysqld/mini_client.cc
libmysqld/my_decimal.cc