diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-20 11:06:20 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-20 11:06:20 +0300 |
| commit | 3236060592757ec84b4abcd9e617009dd68555e1 (patch) | |
| tree | a7bcccbfa761cdaa1d18da7d7f17786a21b8ed60 /innobase/row | |
| parent | 1eec421fec74a09303744f5216ea571f4fa8f4ae (diff) | |
| download | mariadb-git-3236060592757ec84b4abcd9e617009dd68555e1.tar.gz | |
InnoDB: Remove warnings detected by GCC 4.0.0
innobase/fsp/fsp0fsp.c:
Declare "first" in the scope where it is used, and add dummy return
statement after ut_error to silence compiler warning.
innobase/include/dyn0dyn.h:
Add const qualifier to dyn_push_string().
innobase/include/dyn0dyn.ic:
dyn_push_string(): Add const qualifier to str;
remove intermediate assignment.
innobase/include/mtr0log.h:
mlog_write_string(), mlog_catenate_string(): Add const to str
innobase/log/log0log.c:
Eliminate variables new_oldest and do_preflush in order to avoid
warnings about possibly uninitialized variables.
(new_oldest will now be declared in the scope of usage,
and do_preflush == (advance != 0).)
innobase/log/log0recv.c:
Remove warnings about uninitialized variables.
Add UNIV_UNLIKELY() hints.
innobase/mtr/mtr0log.c:
mlog_write_string(), mlog_catenate_string(): Add const to str
mlog_write_string(): Add UNIV_UNLIKELY hints to assertion-like tests
innobase/row/row0sel.c:
Remove warning about possibly uninitialized variable.
(Always initialize *out_rec.)
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0sel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index a2257e0b72e..c7a548fe448 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -630,6 +630,8 @@ row_sel_get_clust_rec( ulint* offsets = offsets_; *offsets_ = (sizeof offsets_) / sizeof *offsets_; + *out_rec = NULL; + offsets = rec_get_offsets(rec, btr_pcur_get_btr_cur(&plan->pcur)->index, offsets, ULINT_UNDEFINED, &heap); @@ -663,8 +665,6 @@ row_sel_get_clust_rec( clustered index record did not exist in the read view of trx. */ - clust_rec = NULL; - goto func_exit; } @@ -733,7 +733,6 @@ row_sel_get_clust_rec( if ((old_vers || rec_get_deleted_flag(rec, plan->table->comp)) && !row_sel_sec_rec_is_for_clust_rec(rec, plan->index, clust_rec, index)) { - clust_rec = NULL; goto func_exit; } } @@ -742,8 +741,8 @@ row_sel_get_clust_rec( row_sel_fetch_columns(index, clust_rec, offsets, UT_LIST_GET_FIRST(plan->columns)); -func_exit: *out_rec = clust_rec; +func_exit: err = DB_SUCCESS; err_exit: if (UNIV_LIKELY_NULL(heap)) { |