diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-01 14:40:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-01 14:40:15 +0300 |
| commit | dfe03adad16ceb27df7c37607d97bc518bc96123 (patch) | |
| tree | 75c9dbe3be51d125d1aca112a9ecf60f4240abef /storage/innobase/row | |
| parent | 567a1246aa437512447d48ef96b48eb37735aa67 (diff) | |
| download | mariadb-git-dfe03adad16ceb27df7c37607d97bc518bc96123.tar.gz | |
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3478.1.4
revision-id: marko.makela@oracle.com-20100525125352-hgafpmqhrrj7pv5i
parent: marko.makela@oracle.com-20100525123748-pmpehbg29oyhc1ns
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Tue 2010-05-25 15:53:52 +0300
message:
row_search_for_mysql(): Add assertions to track down Bug #53627.
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index 0735215a9a9..4d19ed93a49 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/row/row0sel.c @@ -3611,6 +3611,13 @@ shortcut_fails_too_big_rec: trx->has_search_latch = FALSE; } + ut_ad(prebuilt->sql_stat_start || trx->conc_state == TRX_ACTIVE); + ut_ad(trx->conc_state == TRX_NOT_STARTED + || trx->conc_state == TRX_ACTIVE); + ut_ad(prebuilt->sql_stat_start + || prebuilt->select_lock_type != LOCK_NONE + || trx->read_view); + trx_start_if_not_started(trx); if (trx->isolation_level <= TRX_ISO_READ_COMMITTED |