Fix compiler warnings.

storage/innobase/btr/btr0cur.cc

@@ -1863,7 +1863,6 @@ btr_cur_update_alloc_zip_func(
 
 	/* Have a local copy of the variables as these can change
 	dynamically. */
-	ulint	compression_level = page_zip_level;
 	const page_t*	page = page_cur_get_page(cursor);
 
 	ut_ad(page_zip == page_cur_get_page_zip(cursor));

storage/innobase/buf/buf0flu.cc

@@ -2429,7 +2429,6 @@ DECLARE_THREAD(buf_flush_page_cleaner_thread)(
 	ulint	next_loop_time = ut_time_ms() + 1000;
 	ulint	n_flushed = 0;
 	ulint	last_activity = srv_get_activity_count();
-	ulint	n_lru=0;
 
 	ut_ad(!srv_read_only_mode);
 
@@ -2460,13 +2459,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_thread)(
 			last_activity = srv_get_activity_count();
 
 			/* Flush pages from end of LRU if required */
-			n_lru = n_flushed = buf_flush_LRU_tail();
-#ifdef UNIV_MTFLUSH_DEBUG
-			if (n_lru) {
-				fprintf(stderr,"n_lru:%lu ",n_lru);
-			}
-#endif
-
+			n_flushed = buf_flush_LRU_tail();
 			/* Flush pages from flush_list if required */
 			n_flushed += page_cleaner_flush_pages_if_needed();
 

storage/innobase/fil/fil0pagecompress.cc

@@ -195,7 +195,7 @@ fil_compress_page(
 	ut_ad(fil_page_is_compressed(out_buf));
 	ut_ad(mach_read_from_4(out_buf+FIL_PAGE_SPACE_OR_CHKSUM) == BUF_NO_CHECKSUM_MAGIC);
 	ut_ad(mach_read_from_2(out_buf+FIL_PAGE_DATA) == write_size);
-	ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == innodb_compression_algorithm);
+	ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == (ulint)innodb_compression_algorithm);
 #endif /* UNIV_DEBUG */
 
 	write_size+=header_len;
@@ -325,7 +325,7 @@ fil_decompress_page(
 		if (err != (int)actual_size) {
 			fprintf(stderr,
 				"InnoDB: Corruption: Page is marked as compressed\n"
-				"InnoDB: but decompression read only %ld bytes.\n"
+				"InnoDB: but decompression read only %d bytes.\n"
 				"InnoDB: size %lu len %lu\n",
 				err, actual_size, len);
 			fflush(stderr);

storage/innobase/include/os0file.h

@@ -731,8 +731,6 @@ pfs_os_file_read_no_error_handling_func(
 	void*		buf,	/*!< in: buffer where to read */
 	os_offset_t	offset,	/*!< in: file offset where to read */
 	ulint		n,	/*!< in: number of bytes to read */
-	ulint		atomic_writes,/*!< in: atomic writes table option
-				value */
 	const char*	src_file,/*!< in: file name where func invoked */
 	ulint		src_line);/*!< in: line where the func invoked */
 

storage/xtradb/buf/buf0flu.cc

@@ -2694,7 +2694,6 @@ DECLARE_THREAD(buf_flush_page_cleaner_thread)(
 	ulint	n_flushed = 0;
 	ulint	last_activity = srv_get_activity_count();
 	ulint	lru_sleep_time = srv_cleaner_max_lru_time;
-	ulint	n_lru=0, n_pgc_flush=0, n_pgc_batch=0;
 
 	ut_ad(!srv_read_only_mode);
 
@@ -2739,25 +2738,15 @@ DECLARE_THREAD(buf_flush_page_cleaner_thread)(
 		next_loop_time = ut_time_ms() + page_cleaner_sleep_time;
 
 		/* Flush pages from end of LRU if required */
-		n_lru = n_flushed = buf_flush_LRU_tail();
-#ifdef UNIV_MTFLUSH_DEBUG
-		if (n_lru) {
-			fprintf(stderr,"n_lru:%lu ",n_lru);
-		}
-#endif
+		n_flushed = buf_flush_LRU_tail();
 
 		if (srv_check_activity(last_activity)) {
 			last_activity = srv_get_activity_count();
 
 			/* Flush pages from flush_list if required */
-			n_flushed += n_pgc_flush = page_cleaner_flush_pages_if_needed();
-#ifdef UNIV_MTFLUSH_DEBUG
-			if (n_pgc_flush) {
-				fprintf(stderr,"n_pgc_flush:%lu ",n_pgc_flush);
-			}
-#endif
+			n_flushed += page_cleaner_flush_pages_if_needed();
 		} else {
-			n_pgc_batch = n_flushed = page_cleaner_do_flush_batch(
+			n_flushed = page_cleaner_do_flush_batch(
 							PCT_IO(100),
 							LSN_MAX);
 
@@ -2768,20 +2757,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_thread)(
 					MONITOR_FLUSH_BACKGROUND_PAGES,
 					n_flushed);
 			}
-#ifdef UNIV_MTFLUSH_DEBUG
-			if (n_pgc_batch) {
-				fprintf(stderr,"n_pgc_batch:%lu ",n_pgc_batch);
-			}
-#endif
 		}
-
-#ifdef UNIV_MTFLUSH_DEBUG
-		if (n_lru || n_pgc_flush || n_pgc_batch) {
-			fprintf1(stderr,"\n");
-			n_lru = n_pgc_flush = n_pgc_batch = 0;
-		}
-#endif
-
 	}
 
 	ut_ad(srv_shutdown_state > 0);

storage/xtradb/fil/fil0pagecompress.cc

@@ -195,7 +195,7 @@ fil_compress_page(
 	ut_ad(fil_page_is_compressed(out_buf));
 	ut_ad(mach_read_from_4(out_buf+FIL_PAGE_SPACE_OR_CHKSUM) == BUF_NO_CHECKSUM_MAGIC);
 	ut_ad(mach_read_from_2(out_buf+FIL_PAGE_DATA) == write_size);
-	ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == innodb_compression_algorithm);
+	ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == (ulint)innodb_compression_algorithm);
 #endif /* UNIV_DEBUG */
 
 	write_size+=header_len;
@@ -342,7 +342,7 @@ fil_decompress_page(
 		if (err != LZO_E_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) {
 			fprintf(stderr,
 				"InnoDB: Corruption: Page is marked as compressed\n"
-				"InnoDB: but decompression read only %d bytes.\n"
+				"InnoDB: but decompression read only %ld bytes.\n"
 				"InnoDB: size %lu len %lu\n",
 				olen, actual_size, len);
 			fflush(stderr);

storage/xtradb/include/os0file.h

@@ -740,8 +740,6 @@ pfs_os_file_read_func(
 	os_offset_t	offset,	/*!< in: file offset where to read */
 	ulint		n,	/*!< in: number of bytes to read */
 	trx_t*		trx,
-	ulint		atomic_writes,/*!< in: atomic writes table option
-				value */
 	const char*	src_file,/*!< in: file name where func invoked */
 	ulint		src_line);/*!< in: line where the func invoked */
 

storage/xtradb/log/log0log.cc

@@ -3043,7 +3043,7 @@ log_archive_do(
 {
 	ibool		calc_new_limit;
 	ib_uint64_t	start_lsn;
-	ib_uint64_t	limit_lsn;
+	ib_uint64_t	limit_lsn=0;
 
 	calc_new_limit = TRUE;
 loop:

storage/xtradb/srv/srv0start.cc

@@ -1527,7 +1527,7 @@ innobase_start_or_create_for_mysql(void)
 	lsn_t		min_flushed_lsn;
 	lsn_t		max_flushed_lsn;
 #ifdef UNIV_LOG_ARCHIVE
-	lsn_t		min_arch_log_no;
+	lsn_t		min_arch_log_no=0;
 	lsn_t		max_arch_log_no;
 #endif /* UNIV_LOG_ARCHIVE */
 	ulint		sum_of_new_sizes;