summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-03 03:06:42 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-03 03:06:42 +0300
commit0ce6d93f858eb5b67f8988946274ab2b9f060de4 (patch)
tree8555c47c0ce18227ce535252d2c2966af26183d3 /.bzrignore
parentc2fe19883e624ddd0e37768f860fa0853848adb3 (diff)
parente698ae01128fde4f82d4595e67a72cfac09ca125 (diff)
downloadmariadb-git-0ce6d93f858eb5b67f8988946274ab2b9f060de4.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 0a30ac2d9b7..61177d5ed62 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3073,3 +3073,5 @@ dbug/tests
libmysqld/mdl.cc
client/transaction.h
libmysqld/transaction.cc
+libmysqld/sys_vars.cc
+libmysqld/keycaches.cc