← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rename.c

Merge/fix in FAQ.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rename.c
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
/*
17
17
  Rename a table
18
18
*/
19
19
 
20
 
#include "myisam_priv.h"
21
 
 
22
 
using namespace drizzled;
 
20
#include "myisamdef.h"
23
21
 
24
22
int mi_rename(const char *old_name, const char *new_name)
25
23
{
26
24
  char from[FN_REFLEN],to[FN_REFLEN];
27
25
 
28
 
  internal::fn_format(from,old_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
29
 
  internal::fn_format(to,new_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
30
 
  if (internal::my_rename_with_symlink(from, to, MYF(MY_WME)))
31
 
    return(errno);
32
 
  internal::fn_format(from,old_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
33
 
  internal::fn_format(to,new_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
34
 
  return(internal::my_rename_with_symlink(from, to,MYF(MY_WME)) ? errno : 0);
 
26
  fn_format(from,old_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
27
  fn_format(to,new_name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
28
  if (my_rename_with_symlink(from, to, MYF(MY_WME)))
 
29
    return(my_errno);
 
30
  fn_format(from,old_name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
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);
35
33
}