← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_locking.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-28 06:01:24 UTC
  • mto: (968.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 971.
  • Revision ID: osullivan.padraig@gmail.com-20090328060124-fdjygihvmr0kpf58
Reverting some refactoring changes I made to MyISAM that didn't really work
out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_locking.cc
42
42
    ++share->w_locks;
43
43
    ++share->tot_locks;
44
44
    info->lock_type= lock_type;
45
 
    info->s->in_use.push_front(info->in_use);
 
45
    info->s->in_use= list_add(info->s->in_use, &info->in_use);
46
46
    return(0);
47
47
  }
48
48
 
125
125
      }
126
126
      info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
127
127
      info->lock_type= F_UNLCK;
128
 
      info->s->in_use.remove(info->in_use);
 
128
      info->s->in_use= list_delete(info->s->in_use, &info->in_use);
129
129
      break;
130
130
    case F_RDLCK:
131
131
      if (info->lock_type == F_WRLCK)
164
164
      share->r_locks++;
165
165
      share->tot_locks++;
166
166
      info->lock_type=lock_type;
167
 
      info->s->in_use.push_front(info->in_use);
 
167
      info->s->in_use= list_add(info->s->in_use, &info->in_use);
168
168
      break;
169
169
    case F_WRLCK:
170
170
      if (info->lock_type == F_RDLCK)
199
199
      info->lock_type=lock_type;
200
200
      share->w_locks++;
201
201
      share->tot_locks++;
202
 
      info->s->in_use.push_front(info->in_use);
 
202
      info->s->in_use= list_add(info->s->in_use, &info->in_use);
203
203
      break;
204
204
    default:
205
205
      break;                            /* Impossible */