diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-13 10:26:31 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-13 10:26:31 -0800 |
| commit | f560252bdbd7775a2d3b5ac897abfdc1a8c6a7cd (patch) | |
| tree | b6486fc47eb29f073784daba91b7da8e97712848 | |
| parent | 1431fe7e4019d59adb052ccbf33b752828a5b2a9 (diff) | |
| parent | 8b3850df50aee21d45d78d761e4b90046c433c33 (diff) | |
| download | mariadb-git-f560252bdbd7775a2d3b5ac897abfdc1a8c6a7cd.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | sql/ha_archive.cc | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 5b481175685..7555df95b04 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -10,7 +10,6 @@ # ############################################################################## -archive : Change between azio and gzio is causing an issue events : Test case instability - infinite locking. To be fixed. func_group : Bug#15448 func_math : Bug#15448 diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index 31978c3dbfb..b6ae7a4b75f 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -1237,10 +1237,16 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt) azwrite(&writer, block, read); } - azflush(&writer, Z_SYNC_FLUSH); + azclose(&writer); share->dirty= FALSE; azclose(&(share->archive_write)); - share->archive_write= writer; + if (!(azopen(&(share->archive_write), share->data_file_name, + O_WRONLY|O_APPEND|O_BINARY))) + { + DBUG_PRINT("info", ("Could not open archive write file")); + rc= HA_ERR_CRASHED_ON_USAGE; + goto error; + } my_rename(writer_filename,share->data_file_name,MYF(0)); |