diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
| commit | a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7 (patch) | |
| tree | 5d4eaafa051042a726cc5ad7376b13b96111f6cd /storage/xtradb/include/row0upd.ic | |
| parent | 79479ee97571e8023b0269ffddbf525d54955273 (diff) | |
| parent | 6afbf295f018e077be7c569ef8e433e510441bea (diff) | |
| download | mariadb-git-a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7.tar.gz | |
Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5
Diffstat (limited to 'storage/xtradb/include/row0upd.ic')
| -rw-r--r-- | storage/xtradb/include/row0upd.ic | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/storage/xtradb/include/row0upd.ic b/storage/xtradb/include/row0upd.ic index 2968a548b34..11db82f64da 100644 --- a/storage/xtradb/include/row0upd.ic +++ b/storage/xtradb/include/row0upd.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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 @@ -157,11 +157,6 @@ row_upd_rec_sys_fields( { ut_ad(dict_index_is_clust(index)); ut_ad(rec_offs_validate(rec, index, offsets)); -#ifdef UNIV_SYNC_DEBUG - if (!rw_lock_own(btr_search_get_latch(index->id), RW_LOCK_EX)) { - ut_ad(!buf_block_align(rec)->is_hashed); - } -#endif /* UNIV_SYNC_DEBUG */ if (UNIV_LIKELY_NULL(page_zip)) { ulint pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID); @@ -171,7 +166,7 @@ row_upd_rec_sys_fields( ulint offset = index->trx_id_offset; if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } #if DATA_TRX_ID + 1 != DATA_ROLL_PTR |