summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-05 15:08:37 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-05 15:08:37 +0300
commit411a6bfeb94e89f4cd4b8daaee96fe1913218a85 (patch)
tree64caab6e7d4a7167ee56b4f7d6572bb07c30750a /.bzrignore
parentafe8b83bb82055c2510244e26fd2d7ad409f9fbf (diff)
parent06bfaf21f2965539ab76fed3338b3cb0089adc57 (diff)
downloadmariadb-git-411a6bfeb94e89f4cd4b8daaee96fe1913218a85.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 2f21d7f075e..351417a4353 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1139,6 +1139,7 @@ libmysqld/protocol_cursor.cc
libmysqld/records.cc
libmysqld/repl_failsafe.cc
libmysqld/rpl_filter.cc
+libmysqld/rpl_handler.cc
libmysqld/rpl_injector.cc
libmysqld/rpl_record.cc
libmysqld/rpl_record_old.cc
@@ -3065,6 +3066,7 @@ sql/share/swedish
sql/share/ukrainian
libmysqld/examples/mysqltest.cc
libmysqld/sql_signal.cc
+libmysqld/rpl_handler.cc
libmysqld/debug_sync.cc
libmysqld/rpl_handler.cc
dbug/tests