diff options
author | Satya B <satya.bn@sun.com> | 2009-07-10 16:06:07 +0530 |
---|---|---|
committer | Satya B <satya.bn@sun.com> | 2009-07-10 16:06:07 +0530 |
commit | c64b76edeb97048fbf9150ba7a329ad66cb5f267 (patch) | |
tree | e08d7e195be0f6cfdf24dd3bb01ed950aba662e0 /mysql-test/t/innodb_bug42101.test | |
parent | bb4778b57fc657d0f247db816df6c3cc91d8e937 (diff) | |
download | mariadb-git-c64b76edeb97048fbf9150ba7a329ad66cb5f267.tar.gz |
Applying InnoDB snapshot 5.1-ss5488,part 2. Fixes BUG#45749
BUG#45749 - Race condition in SET GLOBAL innodb_commit_concurrency=DEFAULT
Detailed revision comments:
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
Diffstat (limited to 'mysql-test/t/innodb_bug42101.test')
-rw-r--r-- | mysql-test/t/innodb_bug42101.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_bug42101.test b/mysql-test/t/innodb_bug42101.test index 13d531ecde7..b6536490d48 100644 --- a/mysql-test/t/innodb_bug42101.test +++ b/mysql-test/t/innodb_bug42101.test @@ -15,3 +15,5 @@ set global innodb_commit_concurrency=42; select @@innodb_commit_concurrency; set global innodb_commit_concurrency=0; select @@innodb_commit_concurrency; +set global innodb_commit_concurrency=DEFAULT; +select @@innodb_commit_concurrency; |