• marko's avatar
    branches/5.1: Merge r5418 from branches/zip: · 274dd549
    marko authored
      ------------------------------------------------------------------------
      r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
      Changed paths:
         M /branches/zip/ChangeLog
         M /branches/zip/handler/ha_innodb.cc
         M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
         M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
         M /branches/zip/mysql-test/innodb_bug42101.result
         M /branches/zip/mysql-test/innodb_bug42101.test
      
      branches/zip: Fix a race condition caused by
      SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
      When innodb_commit_concurrency is initially set nonzero,
      DEFAULT would change it back to 0, triggering Bug #42101.
      rb://139 approved by Heikki Tuuri.
      ------------------------------------------------------------------------
    274dd549
ha_innodb.cc 243 KB