← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

Viewing changes to storage/innobase/sync/sync0rw.c

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/sync/sync0rw.c
626
626
        ibool   spinning = FALSE;
627
627
 
628
628
        ut_ad(rw_lock_validate(lock));
 
629
#ifdef UNIV_SYNC_DEBUG
 
630
        ut_ad(!rw_lock_own(lock, RW_LOCK_SHARED));
 
631
#endif /* UNIV_SYNC_DEBUG */
629
632
 
630
633
        i = 0;
631
634
 
715
718
UNIV_INTERN
716
719
void
717
720
rw_lock_debug_mutex_enter(void)
718
 
/*==========================*/
 
721
/*===========================*/
719
722
{
720
723
loop:
721
724
        if (0 == mutex_enter_nowait(&rw_lock_debug_mutex)) {
942
945
                                putc('\n', file);
943
946
                        }
944
947
 
 
948
                        rw_lock_debug_mutex_enter();
945
949
                        info = UT_LIST_GET_FIRST(lock->debug_list);
946
950
                        while (info != NULL) {
947
951
                                rw_lock_debug_print(file, info);
948
952
                                info = UT_LIST_GET_NEXT(list, info);
949
953
                        }
 
954
                        rw_lock_debug_mutex_exit();
950
955
                }
951
956
#ifndef INNODB_RW_LOCKS_USE_ATOMICS
952
957
                mutex_exit(&(lock->mutex));
990
995
                        putc('\n', stderr);
991
996
                }
992
997
 
 
998
                rw_lock_debug_mutex_enter();
993
999
                info = UT_LIST_GET_FIRST(lock->debug_list);
994
1000
                while (info != NULL) {
995
1001
                        rw_lock_debug_print(stderr, info);
996
1002
                        info = UT_LIST_GET_NEXT(list, info);
997
1003
                }
 
1004
                rw_lock_debug_mutex_exit();
998
1005
        }
999
1006
}
1000
1007