Commit f560252b authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
parents 1431fe7e 8b3850df

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -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

sql/ha_archive.cc

+8 −2
Original line number Diff line number Diff line
@@ -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));