Merge lp:~linuxjedi/drizzle/trunk-bug-748064 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Fix xtrabackup to compile in GCC 4.6

[Stewart Smith (stewart)]

Unless these bits are just unused because of the #ifdefs for old innobase versions that we've removed in Drizzle, we should fix this in upstream percona-xtrabackup and merge back

review: Needs Fixing

[Brian Aker (brianaker)]

Hmmm I am wondering how fast they fix their trees. I will be concerned if this is a long process (ie we can deal with merges better then we can deal with waiting).

Another way to think about it, we have to be able to ship, whether or not they decide to act or not.

Tricky :)

[Andrew Hutchings (linuxjedi)]

Stewart, unless they compile with the same warning/error set we do then it isn't really affecting percona-xtrabackup. I'd rather it fixed with us first because I can't compile Drizzle locally without this (although I guess I can just manually patch every branch I work on for now).

I'll take a look at percona-xtrabackup branch during the week and see.

[Stewart Smith (stewart)]

https://code.launchpad.net/~stewart/percona-xtrabackup/gcc46-warnings-backport/+merge/57096

maps this back into percona-xtrabackup

review: Approve

=== modified file 'plugin/innobase/xtrabackup/xtrabackup.cc'
--- plugin/innobase/xtrabackup/xtrabackup.cc	2011-03-31 06:41:20 +0000
+++ plugin/innobase/xtrabackup/xtrabackup.cc	2011-04-02 07:37:45 +0000
@@ -1678,7 +1678,6 @@
 	ibool		success;
 	byte*		page;
 	byte*		buf2 = NULL;
-	LSN64		flush_lsn;
 	IB_INT64	file_size;
 	IB_INT64	offset;
 	ulint		page_in_buffer= 0;
@@ -1900,11 +1899,6 @@
 	if (!success) {
 		goto error;
 	}
-	flush_lsn = MACH_READ_64(page + FIL_PAGE_FILE_FLUSH_LSN);
-		/* check current flush lsn newer than checkpoint@start */
-//	if (ut_dulint_cmp(backup_start_checkpoint, flush_lsn) >= 0) {
-//		goto error;
-//	}
 
 	file_size = os_file_get_size_as_iblonglong(src_file);
 
@@ -2111,8 +2105,6 @@
 {
 	/* definition from recv_recovery_from_checkpoint_start() */
 	log_group_t*	group;
-	log_group_t*	up_to_date_group;
-	LSN64		old_scanned_lsn;
 	LSN64		group_scanned_lsn;
 	LSN64		contiguous_lsn;
 
@@ -2135,8 +2127,6 @@
 		LSN64	end_lsn;
 
 
-		old_scanned_lsn = from_lsn;
-
 		/* reference recv_group_scan_log_recs() */
 	finished = FALSE;
 
@@ -2159,7 +2149,6 @@
 	ulint	no;
 	LSN64	scanned_lsn;
 	ulint	data_len;
-	ibool	more_data;
 
 	ulint	scanned_checkpoint_no = 0;
 
@@ -2167,7 +2156,6 @@
 	
 	log_block = log_sys->buf;
 	scanned_lsn = start_lsn;
-	more_data = FALSE;
 
 	while (log_block < log_sys->buf + RECV_SCAN_SIZE && !finished) {
 
@@ -2325,11 +2313,6 @@
 
 		group->scanned_lsn = group_scanned_lsn;
 		
-		if (ut_dulint_cmp(old_scanned_lsn, group_scanned_lsn) < 0) {
-			/* We found a more up-to-date group */
-
-			up_to_date_group = group;
-		}
 
 		fprintf(stderr, ">> log scanned up to (%"PRIu64")\n",group->scanned_lsn);
 
@@ -3232,7 +3215,6 @@
 					ulint	space_id;
 					ulint	page_no;
 					ulint	offset;
-					ulint	extern_len;
 					byte*	blob_header;
 					ulint	part_len;
 					mtr_t	local_mtr;
@@ -3248,7 +3230,6 @@
 					space_id = mach_read_from_4(data + local_len + BTR_EXTERN_SPACE_ID);
 					page_no = mach_read_from_4(data + local_len + BTR_EXTERN_PAGE_NO);
 					offset = mach_read_from_4(data + local_len + BTR_EXTERN_OFFSET);
-					extern_len = mach_read_from_4(data + local_len + BTR_EXTERN_LEN + 4);
 
 					if (offset != FIL_PAGE_DATA)
 						fprintf(stderr, "\nWarning: several record may share same external page.\n");
@@ -3605,7 +3586,6 @@
 
 	LSN64	max_no;
 	LSN64	max_lsn;
-	ulint	max_field;
 	LSN64	checkpoint_no;
 
 	ulint	fold;
@@ -3735,7 +3715,6 @@
 		if (ut_dulint_cmp(checkpoint_no, max_no) >= 0) {
 			max_no = checkpoint_no;
 			max_lsn = MACH_READ_64(log_buf + field + LOG_CHECKPOINT_LSN);
-			max_field = field;
 /*
 			mach_write_to_4(log_buf + field + LOG_CHECKPOINT_OFFSET,
 					LOG_FILE_HDR_SIZE + ut_dulint_minus(max_lsn,