diff options
author | unknown <serg@sergbook.mysql.com> | 2006-05-30 18:21:03 +0200 |
---|---|---|
committer | unknown <serg@sergbook.mysql.com> | 2006-05-30 18:21:03 +0200 |
commit | e05bb63770495b9e5337538b1c98507d2648267a (patch) | |
tree | 56ade099a643866e39df6654ecd81656885e643f /storage/archive | |
parent | 4eeb61b7e35f882cf8d247e6774a1e877601c1d1 (diff) | |
download | mariadb-git-e05bb63770495b9e5337538b1c98507d2648267a.tar.gz |
sql/Makefile.am: better mysqld dependencies
sql/discover.cc: close(-1) bug
sql/slave.cc: DBUG_ENTER/RETURN tags
ha_archive.cc: double-close bug
sql/Makefile.am:
better mysqld dependencies
sql/discover.cc:
close(-1) bug
sql/slave.cc:
DBUG_ENTER/RETURN tags
storage/archive/ha_archive.cc:
double-close bug
Diffstat (limited to 'storage/archive')
-rw-r--r-- | storage/archive/ha_archive.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index b151c61c267..739acffeb0d 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1320,25 +1320,18 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) we don't check rc here because we want to open the file back up even if the optimize failed but we will return rc below so that we will know it failed. + We also need to reopen our read descriptor since it has changed. */ DBUG_PRINT("info", ("Reopening archive data file")); - if (!(azopen(&(share->archive_write), share->data_file_name, - O_WRONLY|O_APPEND|O_BINARY))) + if (!azopen(&(share->archive_write), share->data_file_name, + O_WRONLY|O_APPEND|O_BINARY) || + !azopen(&archive, share->data_file_name, O_RDONLY|O_BINARY)) { DBUG_PRINT("info", ("Could not open archive write file")); rc= HA_ERR_CRASHED_ON_USAGE; - goto error; - } - - /* - Now we need to reopen our read descriptor since it has changed. - */ - if (!(azopen(&archive, share->data_file_name, O_RDONLY|O_BINARY))) - { - rc= HA_ERR_CRASHED_ON_USAGE; - goto error; } + DBUG_RETURN(rc); error: azclose(&writer); |