diff options
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0purge.c | 6 | ||||
| -rw-r--r-- | innobase/trx/trx0rec.c | 5 | ||||
| -rw-r--r-- | innobase/trx/trx0roll.c | 10 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 10 | ||||
| -rw-r--r-- | innobase/trx/trx0undo.c | 8 |
5 files changed, 20 insertions, 19 deletions
diff --git a/innobase/trx/trx0purge.c b/innobase/trx/trx0purge.c index a91ac135f81..31a0c20ad14 100644 --- a/innobase/trx/trx0purge.c +++ b/innobase/trx/trx0purge.c @@ -674,9 +674,9 @@ trx_purge_choose_next_log(void) trx_rseg_t* rseg; trx_rseg_t* min_rseg; dulint min_trx_no; - ulint space; - ulint page_no; - ulint offset; + ulint space = 0; /* remove warning (??? bug ???) */ + ulint page_no = 0; /* remove warning (??? bug ???) */ + ulint offset = 0; /* remove warning (??? bug ???) */ mtr_t mtr; ut_ad(mutex_own(&(purge_sys->mutex))); diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c index abce470bd1c..05e179e06a5 100644 --- a/innobase/trx/trx0rec.c +++ b/innobase/trx/trx0rec.c @@ -989,7 +989,7 @@ trx_undo_parse_erase_page_end( /*==========================*/ /* out: end of log record or NULL */ byte* ptr, /* in: buffer */ - byte* end_ptr,/* in: buffer end */ + byte* end_ptr __attribute__((unused)), /* in: buffer end */ page_t* page, /* in: page or NULL */ mtr_t* mtr) /* in: mtr or NULL */ { @@ -1263,7 +1263,8 @@ trx_undo_prev_version_build( DB_ERROR if corrupted record */ rec_t* index_rec,/* in: clustered index record in the index tree */ - mtr_t* index_mtr,/* in: mtr which contains the latch to + mtr_t* index_mtr __attribute__((unused)), + /* in: mtr which contains the latch to index_rec page and purge_view */ rec_t* rec, /* in: version of a clustered index record */ dict_index_t* index, /* in: clustered index */ diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c index 47fffea5e40..97cc2dbff1a 100644 --- a/innobase/trx/trx0roll.c +++ b/innobase/trx/trx0roll.c @@ -101,7 +101,7 @@ trx_rollback_for_mysql( return(DB_SUCCESS); } - trx->op_info = "rollback"; + trx->op_info = (char *) "rollback"; /* Tell Innobase server that there might be work for utility threads: */ @@ -117,7 +117,7 @@ trx_rollback_for_mysql( srv_active_wake_master_thread(); - trx->op_info = ""; + trx->op_info = (char *) ""; return(err); } @@ -138,7 +138,7 @@ trx_rollback_last_sql_stat_for_mysql( return(DB_SUCCESS); } - trx->op_info = "rollback of SQL statement"; + trx->op_info = (char *) "rollback of SQL statement"; /* Tell Innobase server that there might be work for utility threads: */ @@ -154,7 +154,7 @@ trx_rollback_last_sql_stat_for_mysql( srv_active_wake_master_thread(); - trx->op_info = ""; + trx->op_info = (char *) ""; return(err); } @@ -180,7 +180,7 @@ trx_rollback_all_without_sess(void) if (!trx_dummy_sess) { trx_dummy_sess = sess_open(NULL, (byte*)"Dummy sess", - ut_strlen("Dummy sess")); + ut_strlen((char *) "Dummy sess")); } mutex_exit(&kernel_mutex); diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 18c80819245..5f696d9c01a 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -64,7 +64,7 @@ trx_create( trx = mem_alloc(sizeof(trx_t)); - trx->op_info = ""; + trx->op_info = (char *) ""; trx->type = TRX_USER; trx->conc_state = TRX_NOT_STARTED; @@ -135,7 +135,7 @@ trx_allocate_for_mysql(void) if (!trx_dummy_sess) { trx_dummy_sess = sess_open(NULL, (byte*)"Dummy sess", - ut_strlen("Dummy sess")); + ut_strlen((char *) "Dummy sess")); } trx = trx_create(trx_dummy_sess); @@ -991,7 +991,7 @@ trx_sig_send( ut_a(0); sess_raise_error_low(trx, 0, 0, NULL, NULL, NULL, NULL, - "Signal from another session, or a break execution signal"); + (char *) "Signal from another session, or a break execution signal"); } /* If there were no other signals ahead in the queue, try to start @@ -1292,7 +1292,7 @@ trx_commit_for_mysql( ut_a(trx); - trx->op_info = "committing"; + trx->op_info = (char *) "committing"; trx_start_if_not_started(trx); @@ -1302,7 +1302,7 @@ trx_commit_for_mysql( mutex_exit(&kernel_mutex); - trx->op_info = ""; + trx->op_info = (char *) ""; return(0); } diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c index 8b83163bfc2..d53f8bd73de 100644 --- a/innobase/trx/trx0undo.c +++ b/innobase/trx/trx0undo.c @@ -374,7 +374,7 @@ trx_undo_seg_create( /*================*/ /* out: segment header page x-latched, NULL if no space left */ - trx_rseg_t* rseg, /* in: rollback segment */ + trx_rseg_t* rseg __attribute__((unused)),/* in: rollback segment */ trx_rsegf_t* rseg_hdr,/* in: rollback segment header, page x-latched */ ulint type, /* in: type of the segment: TRX_UNDO_INSERT or @@ -657,7 +657,7 @@ trx_undo_parse_discard_latest( /*==========================*/ /* out: end of log record or NULL */ byte* ptr, /* in: buffer */ - byte* end_ptr,/* in: buffer end */ + byte* end_ptr __attribute__((unused)), /* in: buffer end */ page_t* page, /* in: page or NULL */ mtr_t* mtr) /* in: mtr or NULL */ { @@ -844,7 +844,7 @@ static void trx_undo_free_page_in_rollback( /*===========================*/ - trx_t* trx, /* in: transaction */ + trx_t* trx __attribute__((unused)), /* in: transaction */ trx_undo_t* undo, /* in: undo log memory copy */ ulint page_no,/* in: page number to free: must not be the header page */ @@ -1560,7 +1560,7 @@ trx_undo_set_state_at_finish( /*=========================*/ /* out: undo log segment header page, x-latched */ - trx_t* trx, /* in: transaction */ + trx_t* trx __attribute__((unused)), /* in: transaction */ trx_undo_t* undo, /* in: undo log memory copy */ mtr_t* mtr) /* in: mtr */ { |