bzr push into mysql-trunk-innodb branch (vasil.dimov:3542 to 3543)

[vasil.dimov]

 3543 Vasil Dimov	2011-03-16
      Remove redundant code - just set the nth bit
      
      No need to check if the bit is already set - if it is then setting it
      is a noop.
      
      Reviewed by:	Sunny (via IRC)

    modified:
      storage/innobase/lock/lock0lock.c
 3542 Vasil Dimov	2011-03-15
      Add a hint for enabling -Wconversion in InnoDB code.
      
      Currently fixing all the warnings this flag produces is too much pain.

    modified:
      storage/innobase/CMakeLists.txt
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/lock/lock0lock.c	revid:vasil.dimov@stripped
@@ -2071,13 +2071,7 @@ lock_rec_lock_fast(
 
 			status = LOCK_REC_FAIL;
 		} else if (!impl) {
-			/* If the nth bit of the record lock is already
-			set then we do not set a new lock bit, otherwise
-			we do set */
-
-			if (!lock_rec_get_nth_bit(lock, heap_no)) {
-				lock_rec_set_nth_bit(lock, heap_no);
-			}
+			lock_rec_set_nth_bit(lock, heap_no);
 
 			status = LOCK_REC_SUCCESS_CREATED;
 		}

No bundle (reason: useless for push emails).