diff --git a/.bzrignore b/.bzrignore
index 608a414ae20..c8f50c927ad 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1047,3 +1047,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+libmysqld/ha_federated.cc
diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/t/ctype_cp932.test
old mode 100755
new mode 100644
diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/t/ctype_eucjpms.test
old mode 100755
new mode 100644