← 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): Marc Deslauriers
  • Date: 2012-10-18 11:09:57 UTC
  • mfrom: (1.1.10) (21.1.1 quantal)
  • Revision ID: package-import@ubuntu.com-20121018110957-42tdjjbzsqokg3ia
Tags: 5.5.28-0ubuntu0.12.10.1
https://launchpad.net/bugs/1068158
* SECURITY UPDATE: Update to 5.5.28 to fix security issues (LP: #1068158)
  - http://www.oracle.com/technetwork/topics/security/cpuoct2012-1515893.html
* debian/patches/fix-mysqlhotcopy.patch: removed, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/ha_archive.cc
277
277
 
278
278
  build_table_filename(az_file, sizeof(az_file) - 1, db, name, ARZ, 0);
279
279
 
280
 
  if (!(mysql_file_stat(arch_key_file_data, az_file, &file_stat, MYF(0))))
 
280
  if (!(mysql_file_stat(/* arch_key_file_data */ 0, az_file, &file_stat, MYF(0))))
281
281
    goto err;
282
282
 
283
283
  if (!(azopen(&frm_stream, az_file, O_RDONLY|O_BINARY)))
727
727
    There is a chance that the file was "discovered". In this case
728
728
    just use whatever file is there.
729
729
  */
730
 
  if (!(mysql_file_stat(arch_key_file_data, name_buff, &file_stat, MYF(0))))
 
730
  if (!(mysql_file_stat(/* arch_key_file_data */ 0, name_buff, &file_stat, MYF(0))))
731
731
  {
732
732
    my_errno= 0;
733
733
    if (!(azopen(&create_stream, name_buff, O_CREAT|O_RDWR|O_BINARY)))
1622
1622
  {
1623
1623
    MY_STAT file_stat;  // Stat information for the data file
1624
1624
 
1625
 
    (void) mysql_file_stat(arch_key_file_data, share->data_file_name, &file_stat, MYF(MY_WME));
 
1625
    (void) mysql_file_stat(/* arch_key_file_data */ 0, share->data_file_name, &file_stat, MYF(MY_WME));
1626
1626
 
1627
1627
    if (flag & HA_STATUS_TIME)
1628
1628
      stats.update_time= (ulong) file_stat.st_mtime;