diff --git a/.bzrignore b/.bzrignore
index d09880b1df3..1c9e79fc71b 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -157,3 +157,5 @@ PENDING/2000-10-11.04
 PENDING/2000-10-11.05
 PENDING/2000-10-11.06
 BitKeeper/etc/csets-out
+BitKeeper/etc/csets-in
+support-files/mysql-3.23.26-beta.spec
diff --git a/sql/slave.cc b/sql/slave.cc
index a267421a3bd..bfbe12df22e 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -284,7 +284,7 @@ int init_master_info(MASTER_INFO* mi)
 {
   FILE* file;
   MY_STAT stat_area;
-  char fname[FN_REFLEN];
+  char fname[FN_REFLEN+128];
   fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32);
   
   if(!mi->inited)
@@ -986,5 +986,6 @@ static void safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi)
 
 #ifdef __GNUC__
 template class I_List_iterator<i_string>;
+template class I_List_iterator<i_string_pair>;
 #endif