~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rename.c

  • Committer: Monty Taylor
  • Date: 2008-10-16 06:32:30 UTC
  • mto: (511.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 521.
  • Revision ID: monty@inaugust.com-20081016063230-4brxsra0qsmsg84q
Added -Wunused-macros.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
int mi_rename(const char *old_name, const char *new_name)
23
23
{
24
24
  char from[FN_REFLEN],to[FN_REFLEN];
25
 
  DBUG_ENTER("mi_rename");
26
25
 
27
26
  fn_format(from,old_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
28
27
  fn_format(to,new_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
29
28
  if (my_rename_with_symlink(from, to, MYF(MY_WME)))
30
 
    DBUG_RETURN(my_errno);
 
29
    return(my_errno);
31
30
  fn_format(from,old_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
32
31
  fn_format(to,new_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
33
 
  DBUG_RETURN(my_rename_with_symlink(from, to,MYF(MY_WME)) ? my_errno : 0);
 
32
  return(my_rename_with_symlink(from, to,MYF(MY_WME)) ? my_errno : 0);
34
33
}