← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mariadb-5.5/vivid-proposed

« back to all changes in this revision

Viewing changes to storage/innobase/include/log0log.ic

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-11-14 21:04:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20141114210424-xlyna0ozl11647o5
Tags: 5.5.40-0ubuntu0.14.10.1
https://launchpad.net/bugs/1391676
* SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
  - CVE-2014-6507
  - CVE-2014-6491
  - CVE-2014-6500
  - CVE-2014-6469
  - CVE-2014-6555
  - CVE-2014-6559
  - CVE-2014-6494
  - CVE-2014-6496
  - CVE-2014-6464
* Add bsdutils as mariadb-server dependency like upstream does in 5.5.40.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/log0log.ic
411
411
        return(lsn);
412
412
}
413
413
 
 
414
/************************************************************//**
 
415
Gets the current lsn with a trylock
 
416
@return current lsn or 0 if false*/
 
417
UNIV_INLINE
 
418
lsn_t
 
419
log_get_lsn_nowait(void)
 
420
/*=============*/
 
421
{
 
422
        lsn_t   lsn;
 
423
 
 
424
        if (mutex_enter_nowait(&(log_sys->mutex)))
 
425
          return 0;
 
426
 
 
427
        lsn = log_sys->lsn;
 
428
 
 
429
        mutex_exit(&(log_sys->mutex));
 
430
 
 
431
        return(lsn);
 
432
}
 
433
 
414
434
/****************************************************************
415
435
Gets the log group capacity. It is OK to read the value without
416
436
holding log_sys->mutex because it is constant.