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/rem | |
| 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/rem')
| -rw-r--r-- | innobase/rem/rem0cmp.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c index cf549284acc..f2dc8a7021a 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -321,7 +321,9 @@ cmp_data_data_slow( && dtype_get_charset_coll(cur_type->prtype) != data_mysql_latin1_swedish_charset_coll)) { - return(cmp_whole_field(cur_type, data1, len1, data2, len2)); + return(cmp_whole_field(cur_type, + data1, (unsigned) len1, + data2, (unsigned) len2)); } /* Compare then the fields */ @@ -527,8 +529,9 @@ cmp_dtuple_rec_with_match( ret = cmp_whole_field( cur_type, - dfield_get_data(dtuple_field), dtuple_f_len, - rec_b_ptr, rec_f_len); + dfield_get_data(dtuple_field), + (unsigned) dtuple_f_len, + rec_b_ptr, (unsigned) rec_f_len); if (ret != 0) { cur_bytes = 0; @@ -851,8 +854,8 @@ cmp_rec_rec_with_match( data_mysql_latin1_swedish_charset_coll)) { ret = cmp_whole_field(cur_type, - rec1_b_ptr, rec1_f_len, - rec2_b_ptr, rec2_f_len); + rec1_b_ptr, (unsigned) rec1_f_len, + rec2_b_ptr, (unsigned) rec2_f_len); if (ret != 0) { cur_bytes = 0; |