diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-27 00:37:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-27 00:37:34 +0200 |
| commit | 9ab4829bc6d37e0ffacc016ce09351e9bde8cf81 (patch) | |
| tree | 6d2322142123186d4b150e50f2c06cf513b196f4 /storage | |
| parent | b8b3716ae029f2c550e1ec0b1e50ac01aabf5dc5 (diff) | |
| download | mariadb-git-9ab4829bc6d37e0ffacc016ce09351e9bde8cf81.tar.gz | |
Fixed compiler warnings and a compilation failure on windows
extra/libevent/event.c:
Tried to fix compiler warning on windows
extra/libevent/evutil.h:
Define __attribute__ for not gcc compilers
extra/libevent/kqueue.c:
Fixed compiler warnings
extra/libevent/signal.c:
Tried to fix compiler warning on windows
storage/pbxt/src/ha_pbxt.cc:
Fixed compiler warning about "variable might be clobbered by longjmp"
storage/pbxt/src/table_xt.cc:
Fixed compiler warnings (on windows)
storage/xtradb/handler/i_s.cc:
Fixed compiler warning by invoking the correct store function.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/pbxt/src/ha_pbxt.cc | 2 | ||||
| -rw-r--r-- | storage/pbxt/src/table_xt.cc | 8 | ||||
| -rw-r--r-- | storage/xtradb/handler/i_s.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index ef0ae582c07..8640c079a37 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/storage/pbxt/src/ha_pbxt.cc @@ -1615,7 +1615,7 @@ static int pbxt_prepare(handlerton *hton, THD *thd, bool all) static XTThreadPtr ha_temp_open_global_database(handlerton *hton, THD **ret_thd, int *temp_thread, const char *thread_name, int *err) { THD *thd; - XTThreadPtr self = NULL; + XTThreadPtr volatile self = NULL; *temp_thread = 0; if ((thd = current_thd)) diff --git a/storage/pbxt/src/table_xt.cc b/storage/pbxt/src/table_xt.cc index 8fc6217e183..a9fec660697 100644 --- a/storage/pbxt/src/table_xt.cc +++ b/storage/pbxt/src/table_xt.cc @@ -1822,8 +1822,8 @@ xtPublic void xt_tab_check_free_lists(XTThreadPtr self, XTOpenTablePtr ot, bool } if (free_count != tab->tab_rec_fnum) { if (correct_count) { - tab->tab_rec_fnum = free_count; - tab->tab_head_rec_fnum = free_count; + tab->tab_rec_fnum = (uint) free_count; + tab->tab_head_rec_fnum = (uint) free_count; tab->tab_flush_pending = TRUE; xt_logf(XT_NT_INFO, "Table %s: free record count (%llu) has been set to the number of records on the list: %llu\n", table_name, (u_llong) tab->tab_rec_fnum, (u_llong) free_count); } @@ -1875,8 +1875,8 @@ xtPublic void xt_tab_check_free_lists(XTThreadPtr self, XTOpenTablePtr ot, bool * The correct way to do this at run time would be to add the change to the * transaction log, so that it is applied by the writer. */ - tab->tab_row_fnum = free_count; - tab->tab_head_row_fnum = free_count; + tab->tab_row_fnum = (uint) free_count; + tab->tab_head_row_fnum = (uint) free_count; tab->tab_flush_pending = TRUE; xt_logf(XT_NT_INFO, "Table %s: free row count (%llu) has been set to the number of rows on the list: %llu\n", table_name, (u_llong) tab->tab_row_fnum, (u_llong) free_count); } diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc index 07ee7debca7..d90afc6dbc4 100644 --- a/storage/xtradb/handler/i_s.cc +++ b/storage/xtradb/handler/i_s.cc @@ -763,7 +763,7 @@ i_s_innodb_buffer_pool_pages_index_fill( if (fil_page_get_type(frame) == FIL_PAGE_INDEX) { index_id = btr_page_get_index_id(frame); - table->field[0]->store(ut_conv_dulint_to_longlong(index_id)); + table->field[0]->store(ut_conv_dulint_to_longlong(index_id), 0); table->field[1]->store(block->page.space); table->field[2]->store(block->page.offset); table->field[3]->store(page_get_n_recs(frame)); |