merge from 5.1

6377bbc3 · Inaam Rana · f2706141 · df2da7d7 · 6377bbc3
Commit 6377bbc3 authored Mar 15, 2012 by Inaam Rana
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

storage/innobase/include/sync0rw.ic storage/innobase/include/sync0rw.ic +0 -4

No files found.
--- 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;