diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-08 10:12:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-08 10:12:21 +0200 |
| commit | da846a153b6649e976cc3c2f88dd08ddf81a9a1e (patch) | |
| tree | 99801c82520509cfb062992a5eae46ef05ae3584 /storage/xtradb/row/row0vers.c | |
| parent | 009dee833c94ebcf7199514f32baf3f4530d92f0 (diff) | |
| parent | bcfa90b471b4a04ba9eb9dccd88a41c8f72cd38a (diff) | |
| download | mariadb-git-da846a153b6649e976cc3c2f88dd08ddf81a9a1e.tar.gz | |
Merge with XtraDB as of Percona-Server-5.5.30-rel30.2
Diffstat (limited to 'storage/xtradb/row/row0vers.c')
| -rw-r--r-- | storage/xtradb/row/row0vers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/row/row0vers.c b/storage/xtradb/row/row0vers.c index 6d83dbaf8ee..3fd13b829a2 100644 --- a/storage/xtradb/row/row0vers.c +++ b/storage/xtradb/row/row0vers.c @@ -667,9 +667,9 @@ row_vers_build_for_semi_consistent_read( mutex_enter(&kernel_mutex); version_trx = trx_get_on_id(version_trx_id); - if (version_trx - && (version_trx->conc_state == TRX_COMMITTED_IN_MEMORY - || version_trx->conc_state == TRX_NOT_STARTED)) { + if (version_trx && + (version_trx->state == TRX_COMMITTED_IN_MEMORY + || version_trx->state == TRX_NOT_STARTED)) { version_trx = NULL; } |