diff options
author | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
---|---|---|
committer | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
commit | b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2 (patch) | |
tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /.bzrignore | |
parent | d866afe56f670d5739112fee01c122584ff60145 (diff) | |
parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
download | mariadb-git-b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2.tar.gz |
Manual merge from next-mr.
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 4116338d618..124424b7b11 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3072,3 +3072,5 @@ libmysqld/rpl_handler.cc libmysqld/debug_sync.cc libmysqld/rpl_handler.cc dbug/tests +libmysqld/sys_vars.cc +libmysqld/keycaches.cc |