summaryrefslogtreecommitdiff
path: root/storage/innobase/sync
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-09-14 15:44:34 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-09-14 15:44:34 +0300
commit3d6fc1711c8bff76c9bb848d4e06cdd2c2176e64 (patch)
tree8f02fe681a410b75eb060e630a9150f4a531c690 /storage/innobase/sync
parent3c18c37066215744076bd3381339be137010cf1b (diff)
parentd60cdefc0da9e2d5a49499763fdf5577d9fbb609 (diff)
downloadmariadb-git-3d6fc1711c8bff76c9bb848d4e06cdd2c2176e64.tar.gz
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/sync')
-rw-r--r--storage/innobase/sync/sync0sync.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
index 8e082be33f7..af6e3f0e275 100644
--- a/storage/innobase/sync/sync0sync.c
+++ b/storage/innobase/sync/sync0sync.c
@@ -1338,8 +1338,7 @@ sync_thread_add_level(
break;
case SYNC_IBUF_INDEX_TREE:
if (sync_thread_levels_contain(array, SYNC_FSP)) {
- ut_a(sync_thread_levels_g(
- array, SYNC_FSP_PAGE - 1, TRUE));
+ ut_a(sync_thread_levels_g(array, level - 1, TRUE));
} else {
ut_a(sync_thread_levels_g(
array, SYNC_IBUF_TREE_NODE - 1, TRUE));