diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-07 12:03:33 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-07 12:03:33 +0200 |
| commit | 9c6cc47f749d37fb0cc9d5ff48818237bacd5012 (patch) | |
| tree | 4565fc5d7d0ed12c3a3ced426325b262f97ed87b /innobase/row | |
| parent | ae81d53048643da4b110c936eaec0a895af06219 (diff) | |
| download | mariadb-git-9c6cc47f749d37fb0cc9d5ff48818237bacd5012.tar.gz | |
InnoDB: Portability fixes for warnings reported on IA-64 Windows
innobase/buf/buf0lru.c:
Portability fix: Use %p for printing pointers
innobase/dict/dict0dict.c:
Properly cast the arguments of toupper()
innobase/eval/eval0proc.c:
Declare loop_var_value with a matching data type.
innobase/include/mem0mem.ic:
Remove implicit type conversion
innobase/include/page0page.ic:
Portability fix: Use %p for printing pointers
innobase/include/pars0pars.h:
Remove implicit type conversion
innobase/include/pars0sym.h:
Remove implicit type conversion
innobase/mem/mem0dbg.c:
Portability fix: Use %p for printing pointers
innobase/os/os0file.c:
Add DWORD casts for Windows
innobase/os/os0sync.c:
Add DWORD casts for Windows
innobase/os/os0thread.c:
Add DWORD casts for Windows
innobase/rem/rem0cmp.c:
Make implicit type conversions explicit
innobase/row/row0mysql.c:
Make implicit type conversions explicit
innobase/row/row0sel.c:
Portability fix: Use %p for printing pointers
innobase/trx/trx0sys.c:
Declare trx_sys_mysql_bin_log_pos_high and
trx_sys_mysql_bin_log_pos_low with a matching data type
innobase/ut/ut0ut.c:
Make implicit type conversion explicit
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0mysql.c | 12 | ||||
| -rw-r--r-- | innobase/row/row0sel.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 482cf698547..e2b34e6e3f1 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -745,7 +745,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -839,7 +839,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -954,7 +954,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1202,7 +1202,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1367,7 +1367,7 @@ row_mysql_recover_tmp_table( } else { int status; - int namelen = strlen(table->name); + int namelen = (int) strlen(table->name); char* old_name = mem_strdupl(table->name, namelen); /* replace "rsql" with "#sql" */ old_name[ptr - table->name + 1] = '#'; @@ -1857,7 +1857,7 @@ row_drop_table_for_mysql_in_background( trx_free_for_background(trx); - return(error); + return((int) error); } /************************************************************************* diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 7c935128d8a..07140e74e54 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3326,10 +3326,10 @@ rec_loop: ut_print_timestamp(stderr); buf_page_print(buf_frame_align(rec)); fprintf(stderr, -"\nInnoDB: rec address %lx, first buffer frame %lx\n" -"InnoDB: buffer pool high end %lx, buf block fix count %lu\n", - (ulong)rec, (ulong)buf_pool->frame_zero, - (ulong)buf_pool->high_end, +"\nInnoDB: rec address %p, first buffer frame %p\n" +"InnoDB: buffer pool high end %p, buf block fix count %lu\n", + rec, buf_pool->frame_zero, + buf_pool->high_end, (ulong)buf_block_align(rec)->buf_fix_count); fprintf(stderr, "InnoDB: Index corruption: rec offs %lu next offs %lu, page no %lu,\n" |