← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

  • Committer: Brian Aker
  • Date: 2010-11-29 07:05:33 UTC
  • mfrom: (1960.1.2 refactor)
  • Revision ID: brian@tangent.org-20101129070533-grqo3e8by2wqqpcd
Rollup of scoped lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
242
242
           sql_lock->getLocks(),
243
243
           sql_lock->sizeLock() * sizeof(*sql_lock->getLocks()));
244
244
    /* Lock on the copied half of the lock data array. */
245
 
    rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->getLocks() +
 
245
    rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(*this,
 
246
                                                     sql_lock->getLocks() +
246
247
                                                     sql_lock->sizeLock(),
247
248
                                                     sql_lock->sizeLock(),
248
249
                                                     this->lock_id)];