← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/sync0rw.ic
90
90
        rw_lock_t*      lock)   /*!< in/out: rw-lock */
91
91
{
92
92
#ifdef INNODB_RW_LOCKS_USE_ATOMICS
93
 
        os_compare_and_swap_ulint(&lock->waiters, 0, 1);
 
93
        (void) os_compare_and_swap_ulint(&lock->waiters, 0, 1);
94
94
#else /* INNODB_RW_LOCKS_USE_ATOMICS */
95
95
        lock->waiters = 1;
96
96
#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
107
107
        rw_lock_t*      lock)   /*!< in/out: rw-lock */
108
108
{
109
109
#ifdef INNODB_RW_LOCKS_USE_ATOMICS
110
 
        os_compare_and_swap_ulint(&lock->waiters, 1, 0);
 
110
        (void) os_compare_and_swap_ulint(&lock->waiters, 1, 0);
111
111
#else /* INNODB_RW_LOCKS_USE_ATOMICS */
112
112
        lock->waiters = 0;
113
113
#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
564
564
        if (lock->lock_word == 0) {
565
565
                /* Last caller in a possible recursive chain. */
566
566
                lock->recursive = FALSE;
567
 
                UNIV_MEM_INVALID(&lock->writer_thread,
568
 
                                 sizeof lock->writer_thread);
569
567
        }
570
568
 
571
569
#ifdef UNIV_SYNC_DEBUG
610
608
 
611
609
        if (lock->lock_word == 0) {
612
610
                lock->recursive = FALSE;
613
 
                UNIV_MEM_INVALID(&lock->writer_thread,
614
 
                                 sizeof lock->writer_thread);
615
611
        }
616
612
 
617
613
        lock->lock_word += X_LOCK_DECR;