database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-27 05:56:07 +03:00
Code Activity

BUG#11748748: Merge from mysql-5.1 to mysql-5.5

Browse Source
This commit is contained in:
Ashish Agarwal
2012-02-03 19:41:03 +05:30
parent 9e3eabf54d 8862a5b5e9
commit 974c2ab56e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/archive/ha_archive.cc
View File

@@ -1394,6 +1394,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
char writer_filename[FN_REFLEN]; char writer_filename[FN_REFLEN];
DBUG_ENTER("ha_archive::optimize"); DBUG_ENTER("ha_archive::optimize");
mysql_mutex_lock(&share->mutex);
init_archive_reader(); init_archive_reader();
// now we close both our writer and our reader for the rename // now we close both our writer and our reader for the rename
@@ -1408,7 +1409,10 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
MY_REPLACE_EXT | MY_UNPACK_FILENAME); MY_REPLACE_EXT | MY_UNPACK_FILENAME);
if (!(azopen(&writer, writer_filename, O_CREAT|O_RDWR|O_BINARY))) if (!(azopen(&writer, writer_filename, O_CREAT|O_RDWR|O_BINARY)))
{
mysql_mutex_unlock(&share->mutex);
DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE); DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
}
/* /*
Transfer the embedded FRM so that the file can be discoverable. Transfer the embedded FRM so that the file can be discoverable.
@@ -1494,10 +1498,12 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
rc= my_rename(writer_filename, share->data_file_name, MYF(0)); rc= my_rename(writer_filename, share->data_file_name, MYF(0));
mysql_mutex_unlock(&share->mutex);
DBUG_RETURN(rc); DBUG_RETURN(rc);
error: error:
DBUG_PRINT("ha_archive", ("Failed to recover, error was %d", rc)); DBUG_PRINT("ha_archive", ("Failed to recover, error was %d", rc));
azclose(&writer); azclose(&writer);
mysql_mutex_unlock(&share->mutex);
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }