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
commit056ac55aa0954b3321aa5e838a5563e731c1c516 (patch)
tree8555c47c0ce18227ce535252d2c2966af26183d3 /.bzrignore
parenta6daa9ada052b7b7b09683ea6d565c92f5e15512 (diff)
parent3701208a2e890d42aabc678a2a5d4ea539941b36 (diff)
downloadmariadb-git-056ac55aa0954b3321aa5e838a5563e731c1c516.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