diff options
author | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
commit | 014b8e7f435e495151fe0ef2cfd5e93d1a398ce5 (patch) | |
tree | b432f6305fe79b126a19fa03124d28a7a2f05cbe /.bzrignore | |
parent | d02d52629d2eda10a50079001a79d50bf3d528cd (diff) | |
download | mariadb-git-014b8e7f435e495151fe0ef2cfd5e93d1a398ce5.tar.gz |
Backport MySQL WL#2540 into MariaDB.
Patch backported:
bzr diff
'-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0
..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr'
--old=lp:mysql-server --new=lp:mysql-server
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 0a28dc4af94..170e29c6af6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -336,6 +336,7 @@ client/rpl_record_old.h client/rpl_tblmap.h client/rpl_tblmap.cc client/rpl_utility.h +client/rpl_utility.cc client/select_test client/sql_string.cpp client/ssl_test @@ -672,6 +673,8 @@ libmysqld/unireg.cc libmysqld/discover_xt.cc libmysqld/ha_pbxt.cc libmysqld/myxt_xt.cc +libmysqld/rpl_reporting.cc +libmysqld/rpl_utility.cc libmysqltest/*.ds? libmysqltest/*.vcproj libmysqltest/mytest.c |