← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/handler.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:
sql/handler.cc
4655
4655
                ? HA_ERR_END_OF_FILE
4656
4656
                : result);
4657
4657
 
4658
 
  DBUG_RETURN (compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE);
 
4658
  if (compare_key(end_range) <= 0)
 
4659
  {
 
4660
    DBUG_RETURN(0);
 
4661
  }
 
4662
  else
 
4663
  {
 
4664
    /*
 
4665
      The last read row does not fall in the range. So request
 
4666
      storage engine to release row lock if possible.
 
4667
    */
 
4668
    unlock_row();
 
4669
    DBUG_RETURN(HA_ERR_END_OF_FILE);
 
4670
  }
4659
4671
}
4660
4672
 
4661
4673
 
4687
4699
  result= index_next(table->record[0]);
4688
4700
  if (result)
4689
4701
    DBUG_RETURN(result);
4690
 
  DBUG_RETURN(compare_key(end_range) <= 0 ? 0 : HA_ERR_END_OF_FILE);
 
4702
 
 
4703
  if (compare_key(end_range) <= 0)
 
4704
  {
 
4705
    DBUG_RETURN(0);
 
4706
  }
 
4707
  else
 
4708
  {
 
4709
    /*
 
4710
      The last read row does not fall in the range. So request
 
4711
      storage engine to release row lock if possible.
 
4712
    */
 
4713
    unlock_row();
 
4714
    DBUG_RETURN(HA_ERR_END_OF_FILE);
 
4715
  }
4691
4716
}
4692
4717
 
4693
4718