Commit 0bfbba10 authored by unknown's avatar unknown
Browse files

InnoDB: Remove some warnings reported by GCC 4.0.0. 


innobase/log/log0recv.c:
  Remove GCC 4.0.0 warnings about possibly uninitialized variables.
innobase/row/row0umod.c:
  row_undo_mod_undo_also_prev_vers(): Remove unused parameter thr,
  always initialize *undo_no to remove GCC 4.0.0 warning
innobase/trx/trx0undo.c:
  trx_undo_write_xid(): Remove warning about signedness mismatch,
  add const qualifier to parameter xid.
sql/ha_innodb.cc:
  Add proper casts from ulonglong to ulong in fprintf statements.
parent 2db945e3

innobase/log/log0recv.c

+4 −1
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ recv_find_max_checkpoint( 


	max_no = ut_dulint_zero;

	*max_group = NULL;

	*max_field = 0;

	

	buf = log_sys->checkpoint_buf;
@@ -543,7 +544,6 @@ recv_find_max_checkpoint( 
"InnoDB: to create the InnoDB data files, but log file creation failed.\n"

"InnoDB: If that is the case, please refer to\n"

"InnoDB: http://dev.mysql.com/doc/mysql/en/Error_creating_InnoDB.html\n");

		*max_field = 0;

		return(DB_ERROR);

	}
@@ -1168,6 +1168,7 @@ recv_recover_page( 
	}



	modification_to_page = FALSE;

	start_lsn = end_lsn = ut_dulint_zero;



	recv = UT_LIST_GET_FIRST(recv_addr->rec_list);
@@ -1796,6 +1797,8 @@ recv_parse_log_rec( 
{

	byte*	new_ptr;



	*body = NULL;



	if (ptr == end_ptr) {



		return(0);

innobase/row/row0umod.c

+3 −12
Original line number Diff line number Diff line
@@ -52,19 +52,16 @@ row_undo_mod_undo_also_prev_vers( 
				/* out: TRUE if also previous modify or

				insert of this row should be undone */

 	undo_node_t*	node,	/* in: row undo node */

	que_thr_t*	thr,	/* in: query thread */

	dulint*		undo_no)/* out: the undo number */

{

	trx_undo_rec_t*	undo_rec;

	ibool		ret;

	trx_t*		trx;



	UT_NOT_USED(thr);



	trx = node->trx;

	

	if (0 != ut_dulint_cmp(node->new_trx_id, trx->id)) {



		*undo_no = ut_dulint_zero;

		return(FALSE);

	}
@@ -72,13 +69,7 @@ row_undo_mod_undo_also_prev_vers( 


	*undo_no = trx_undo_rec_get_undo_no(undo_rec);



	if (ut_dulint_cmp(trx->roll_limit, *undo_no) <= 0) {

		ret = TRUE;

	} else {

		ret = FALSE;

	}

	

	return(ret);

	return(ut_dulint_cmp(trx->roll_limit, *undo_no) <= 0);

}

	

/***************************************************************
@@ -214,7 +205,7 @@ row_undo_mod_clust( 
	/* Check if also the previous version of the clustered index record

	should be undone in this same rollback operation */



	more_vers = row_undo_mod_undo_also_prev_vers(node, thr, &new_undo_no);

	more_vers = row_undo_mod_undo_also_prev_vers(node, &new_undo_no);



	pcur = &(node->pcur);

innobase/trx/trx0undo.c

+2 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ void 
trx_undo_write_xid(

/*===============*/

	trx_ulogf_t*	log_hdr,/* in: undo log header */

	XID*		xid,	/* in: X/Open XA Transaction Identification */

	const XID*	xid,	/* in: X/Open XA Transaction Identification */

	mtr_t*		mtr)	/* in: mtr */

{

	mlog_write_ulint(log_hdr + TRX_UNDO_XA_FORMAT, xid->formatID,
@@ -568,7 +568,7 @@ trx_undo_write_xid( 
	mlog_write_ulint(log_hdr + TRX_UNDO_XA_BQUAL_LEN, xid->bqual_length,

							MLOG_4BYTES, mtr);



	mlog_write_string(log_hdr + TRX_UNDO_XA_XID, xid->data,

	mlog_write_string(log_hdr + TRX_UNDO_XA_XID, (const byte*) xid->data,

							XIDDATASIZE, mtr);

}

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ innobase_mysql_print_thd( 
        thd = (const THD*) input_thd;



  	fprintf(f, "MySQL thread id %lu, query id %lu",

		thd->thread_id, thd->query_id);

		thd->thread_id, (ulong) thd->query_id);

	if (thd->host) {

		putc(' ', f);

		fputs(thd->host, f);
@@ -1805,7 +1805,7 @@ innobase_commit_complete( 
                        fprintf(stderr,

"InnoDB: This transaction needs it to be sent up to\n"

"InnoDB: file %s, position %lu\n", trx->repl_wait_binlog_name,

                                        (uint)trx->repl_wait_binlog_pos);

                                        (ulong)trx->repl_wait_binlog_pos);



                        innobase_repl_state = 0;