bzr push into mysql-trunk-wl5534-stage branch (marko.makela:3816 to 3818)

[marko.makela]

 3818 Marko Mäkelä	2012-02-01
      Silence a bogus warning about an uninitialized variable.

    modified:
      storage/innobase/row/row0log.cc
 3817 Marko Mäkelä	2012-02-01
      Remove an unnecessary variable declaration.

    modified:
      storage/innobase/row/row0merge.cc
 3816 Marko Mäkelä	2012-02-01
      Hopefully fix os_atomic_increment_uint64() on Windows.

    modified:
      storage/innobase/include/os0sync.h
=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:marko.makela@strippedv9mwb132g6sh9yx
+++ b/storage/innobase/row/row0log.cc	revid:marko.makela@strippedt
@@ -740,7 +740,7 @@ row_log_apply_ops(
 	ulint		error;
 	const mrec_t*	mrec	= NULL;
 	const mrec_t*	next_mrec;
-	const mrec_t*	mrec_end;
+	const mrec_t*	mrec_end= NULL; /* silence bogus warning */
 	const mrec_t*	next_mrec_end;
 	mem_heap_t*	heap;
 	ulint*		offsets;
@@ -754,6 +754,7 @@ row_log_apply_ops(
 	ut_ad(rw_lock_own(dict_index_get_lock(index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */
 	ut_ad(index->info.online_log);
+	UNIV_MEM_INVALID(&mrec_end, sizeof mrec_end);
 
 	offsets = static_cast<ulint*>(ut_malloc(i * sizeof *offsets));
 	offsets[0] = i;

=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:[e-mail]-20120201204858-fv9mwb132g6sh9yx
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@stripped201211456-r85wyt2hh6buxatt
@@ -2168,8 +2168,6 @@ row_merge_insert_index_tuples(
 	if (!row_merge_read(fd, foffs, block)) {
 		error = DB_CORRUPTION;
 	} else {
-		mrec_buf_t*	buf;
-
 		buf = static_cast<mrec_buf_t*>(
 			mem_heap_alloc(heap, sizeof *buf));
 

No bundle (reason: useless for push emails).