← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

Viewing changes to storage/archive/ha_archive.cc

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/ha_archive.cc
898
898
    table->timestamp_field->set_time();
899
899
  mysql_mutex_lock(&share->mutex);
900
900
 
901
 
  if (!share->archive_write_open)
902
 
    if (init_archive_writer())
903
 
      DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
904
 
 
 
901
  if (!share->archive_write_open && init_archive_writer())
 
902
  {
 
903
    rc= HA_ERR_CRASHED_ON_USAGE;
 
904
    goto error;
 
905
  }
905
906
 
906
907
  if (table->next_number_field && record == table->record[0])
907
908
  {
980
981
  rc= real_write_row(buf,  &(share->archive_write));
981
982
error:
982
983
  mysql_mutex_unlock(&share->mutex);
983
 
  my_free(read_buf);
984
 
 
 
984
  if (read_buf)
 
985
    my_free(read_buf);
985
986
  DBUG_RETURN(rc);
986
987
}
987
988