summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-10 10:31:33 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-10 10:31:33 +0300
commitb712dce3d57335d3957afe94d1c3200880aebe99 (patch)
treeb118b585c21710f0fef58c3d009fdd39a4578791 /.bzrignore
parent49bb8cba8e964bec96c1ca9cdc486b3a468dd822 (diff)
parentd476bbb0becb27d7d3cb1fc5cc0ac4d401622893 (diff)
downloadmariadb-git-b712dce3d57335d3957afe94d1c3200880aebe99.tar.gz
Auto-merge from mysql-next-mr.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index ac0347558b7..351417a4353 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3068,3 +3068,5 @@ libmysqld/examples/mysqltest.cc
libmysqld/sql_signal.cc
libmysqld/rpl_handler.cc
libmysqld/debug_sync.cc
+libmysqld/rpl_handler.cc
+dbug/tests