mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 19:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

InnoDB: Remove some warnings reported by GCC 4.0.0.

Browse source 
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.
This commit is contained in:
unknown 2005-06-21 11:49:55 +03:00
commit 0bfbba1064
4 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
innobase/row/row0umod.c
View file

@ -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);