← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_repl.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 04:42:46 UTC
  • mfrom: (575.4.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107044246-n8hnlrzsjn0uvca0
Merged from ysano. Reverted changes to storage/innobase/handler, which is not built by drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_repl.cc
1050
1050
  // close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0
1051
1051
  mi->end_master_info();
1052
1052
  // and delete these two files
1053
 
  fn_format(fname, master_info_file, mysql_data_home, "", 4+32);
 
1053
  fn_format(fname, master_info_file, drizzle_data_home, "", 4+32);
1054
1054
  if (!stat(fname, &stat_area) && my_delete(fname, MYF(MY_WME)))
1055
1055
  {
1056
1056
    error=1;
1057
1057
    goto err;
1058
1058
  }
1059
1059
  // delete relay_log_info_file
1060
 
  fn_format(fname, relay_log_info_file, mysql_data_home, "", 4+32);
 
1060
  fn_format(fname, relay_log_info_file, drizzle_data_home, "", 4+32);
1061
1061
  if (!stat(fname, &stat_area) && my_delete(fname, MYF(MY_WME)))
1062
1062
  {
1063
1063
    error=1;