← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rnext.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
https://launchpad.net/bugs/987575
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rnext.cc
28
28
{
29
29
  int error,changed;
30
30
  uint32_t flag;
31
 
  int res= 0;
32
31
 
33
32
  if ((inx = _mi_check_index(info,inx)) < 0)
34
33
    return(errno);
66
65
 
67
66
  if (!error)
68
67
  {
 
68
    int res= 0;
69
69
    while ((info->s->concurrent_insert &&
70
70
            info->lastpos >= info->state->data_file_length) ||
71
71
           (info->index_cond_func &&