Merged Google compiler fixes

storage/innobase/include/sync0rw.ic

@@ -480,7 +480,8 @@ rw_lock_x_unlock_func(
 	If we are not the last unlocker, we correct it later in the function,
 	which is harmless since we still hold the lock. */
 	/* TODO: are there any risks of a thread id == -1 on any platform? */
-        os_thread_id_t local_writer_thread = lock->writer_thread;
+        os_thread_id_t local_writer_thread;
+        local_write_thread = lock->writer_thread;
 	lock->writer_thread = -1;
 
 #ifdef UNIV_SYNC_DEBUG

storage/innobase/os/os0file.c

@@ -3730,7 +3730,7 @@ os_aio_windows_handle(
 	ut_a(slot->reserved);
 
 	if (global_segment != ULINT_UNDEFINED) {
-		srv_set_io_thread_op_info(orig_seg,
+		srv_set_io_thread_op_info(global_segment,
 					  "get windows aio return value");
 	}