Commit ab35839a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines


mysys/my_redel.c:
  Auto merged
parents 805d73c5 817a474c

mysys/my_redel.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int my_redel(const char *org_name, const char *tmp_name, myf MyFlags) 
		  MyFlags))

      goto end;

  }

  else if (my_delete(org_name,MyFlags))

  else if (my_delete_allow_opened(org_name, MyFlags))

      goto end;

  if (my_rename(tmp_name,org_name,MyFlags))

    goto end;