diff --git a/.bzrignore b/.bzrignore index d09880b1df397302ba7b39b8b4406675ce54583f..1c9e79fc71b9f1f1bf8e83ff0df93bc4df1a7021 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 a267421a3bd4005a5d9e40e6509751a329e73259..bfbe12df22ee305532be5b7cd65c5c25d0b679cc 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