diff options
author | Inaam Rana <inaam.rana@oracle.com> | 2012-05-24 12:44:27 -0400 |
---|---|---|
committer | Inaam Rana <inaam.rana@oracle.com> | 2012-05-24 12:44:27 -0400 |
commit | b91be277331679a8c36000fff56d0087834b7c75 (patch) | |
tree | ab2bce4fac2dfbd31c04f63a800bf2ce5573c8f0 /storage | |
parent | dcd4fa3fd5330945cb996081e521b2d9d635edab (diff) | |
parent | 01748ce128ae4c29cfb63e88cd68918e7d48e946 (diff) | |
download | mariadb-git-b91be277331679a8c36000fff56d0087834b7c75.tar.gz |
merge from 5.1
Diffstat (limited to 'storage')
-rw-r--r-- | storage/innobase/row/row0vers.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/storage/innobase/row/row0vers.c b/storage/innobase/row/row0vers.c index 5fd7d082194..6d83dbaf8ee 100644 --- a/storage/innobase/row/row0vers.c +++ b/storage/innobase/row/row0vers.c @@ -209,17 +209,6 @@ row_vers_impl_x_locked_off_kernel( prev_trx_id = row_get_rec_trx_id(prev_version, clust_index, clust_offsets); - /* If the trx_id and prev_trx_id are different and if - the prev_version is marked deleted then the - prev_trx_id must have already committed for the trx_id - to be able to modify the row. Therefore, prev_trx_id - cannot hold any implicit lock. */ - if (vers_del && trx_id != prev_trx_id) { - - mutex_enter(&kernel_mutex); - break; - } - /* The stack of versions is locked by mtr. Thus, it is safe to fetch the prefixes for externally stored columns. */ |