Commit a1b0139f authored by unknown's avatar unknown
Browse files

BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error 

 - Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.


mysql-test/r/archive.result:
  Warning is not produced anymore
sql/examples/ha_archive.cc:
  Change ha_archive::rename_table to avoid warning when trying to rename non existent file.
parent cde34dfb

mysql-test/r/archive.result

+0 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ select count(*) from t3; 
count(*)

1199

rename table t3 to t4;

Warnings:

Error	7	Error on rename of './test/t3.ARN' to './test/t4.ARN' (Errcode: 2)

select * from t4 where fld3='bonfire';

auto	fld1	companynr	fld3	fld4	fld5	fld6

1191	068504	00	bonfire	corresponds	positively

sql/examples/ha_archive.cc

+11 −6
Original line number Diff line number Diff line
@@ -455,17 +455,22 @@ const char **ha_archive::bas_ext() const 
int ha_archive::rename_table(const char * from, const char * to)

{

  DBUG_ENTER("ha_archive::rename_table");

  DBUG_PRINT("enter", ("from: %s, to: %s", from, to));

  for (const char **ext=bas_ext(); *ext ; ext++)

  {

    if (rename_file_ext(from,to,*ext))

    // Check if the .arn file exists before rename

    if (!my_strcasecmp(system_charset_info, *ext, ARN))

    {

      char name[FN_REFLEN];

      (void)strxnmov(name, FN_REFLEN, from, ARN, NullS);

      if (access(name, F_OK))

      {

      if (my_errno == ENOENT &&

          !my_strcasecmp(system_charset_info, *ext, ARN))

        DBUG_PRINT("info", ("%s does not exist on disk, skipping it", name));

        continue;



      DBUG_RETURN(my_errno);

      }



    }

    if (rename_file_ext(from,to,*ext))

      DBUG_RETURN(my_errno);

  }

  DBUG_RETURN(0);

}