diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
| commit | 3f1c763a94cd25c4810692983f6e61b528e21268 (patch) | |
| tree | d8f9632933303f9bdf8cdc875613ca99f51ecbcb /storage/xtradb/include/mtr0mtr.ic | |
| parent | a74d04671d23fa65bd610184965cc2974ec41cf9 (diff) | |
| parent | 0c6afe17dceb926b5c757157308188e540caec1e (diff) | |
| download | mariadb-git-3f1c763a94cd25c4810692983f6e61b528e21268.tar.gz | |
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/mtr0mtr.ic')
| -rw-r--r-- | storage/xtradb/include/mtr0mtr.ic | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/xtradb/include/mtr0mtr.ic b/storage/xtradb/include/mtr0mtr.ic index 310c7c4117f..18f8e87b3cf 100644 --- a/storage/xtradb/include/mtr0mtr.ic +++ b/storage/xtradb/include/mtr0mtr.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -70,6 +70,7 @@ mtr_memo_push( ut_ad(type <= MTR_MEMO_X_LOCK); ut_ad(mtr); ut_ad(mtr->magic_n == MTR_MAGIC_N); + ut_ad(mtr->state == MTR_ACTIVE); memo = &(mtr->memo); @@ -92,6 +93,7 @@ mtr_set_savepoint( ut_ad(mtr); ut_ad(mtr->magic_n == MTR_MAGIC_N); + ut_ad(mtr->state == MTR_ACTIVE); memo = &(mtr->memo); @@ -149,6 +151,7 @@ mtr_memo_contains( ut_ad(mtr); ut_ad(mtr->magic_n == MTR_MAGIC_N); + ut_ad(mtr->state == MTR_ACTIVE || mtr->state == MTR_COMMITTING); memo = &(mtr->memo); |