← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rename.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rename.cc
26
26
  fn_format(from,old_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
27
27
  fn_format(to,new_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
28
28
  if (my_rename_with_symlink(from, to, MYF(MY_WME)))
29
 
    return(my_errno);
 
29
    return(errno);
30
30
  fn_format(from,old_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
31
31
  fn_format(to,new_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
32
 
  return(my_rename_with_symlink(from, to,MYF(MY_WME)) ? my_errno : 0);
 
32
  return(my_rename_with_symlink(from, to,MYF(MY_WME)) ? errno : 0);
33
33
}