summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorInaam Rana <inaam.rana@oracle.com>2012-03-15 11:57:01 -0400
committerInaam Rana <inaam.rana@oracle.com>2012-03-15 11:57:01 -0400
commit2ceb117750824492f87b1c217250cd886215e7b8 (patch)
tree5d5e3080ba051742ea1109096e682e9528a9ea3c /storage
parent1f5051d9f2bc2353a1ec7363f2b50c5ba34b28e2 (diff)
parenta8217b7cd3e31c7ff5212b84b9736af689a5ad39 (diff)
downloadmariadb-git-2ceb117750824492f87b1c217250cd886215e7b8.tar.gz
merge from 5.1
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/include/sync0rw.ic4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index f451ae24d59..a5a7cda14f9 100644
--- a/storage/innobase/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
@@ -564,8 +564,6 @@ rw_lock_x_unlock_func(
if (lock->lock_word == 0) {
/* Last caller in a possible recursive chain. */
lock->recursive = FALSE;
- UNIV_MEM_INVALID(&lock->writer_thread,
- sizeof lock->writer_thread);
}
#ifdef UNIV_SYNC_DEBUG
@@ -610,8 +608,6 @@ rw_lock_x_unlock_direct(
if (lock->lock_word == 0) {
lock->recursive = FALSE;
- UNIV_MEM_INVALID(&lock->writer_thread,
- sizeof lock->writer_thread);
}
lock->lock_word += X_LOCK_DECR;