mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
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
This commit is contained in:
parent
ae81d53048
commit
9c6cc47f74
16 changed files with 51 additions and 46 deletions
|
|
@ -606,7 +606,7 @@ mem_strdupq(
|
|||
char* dst;
|
||||
char* d;
|
||||
const char* s = str;
|
||||
int len = strlen(str) + 3;
|
||||
size_t len = strlen(str) + 3;
|
||||
/* calculate the number of quote characters in the string */
|
||||
while((s = strchr(s, q)) != NULL) {
|
||||
s++;
|
||||
|
|
|
|||
|
|
@ -484,10 +484,10 @@ page_rec_get_next(
|
|||
"InnoDB: Next record offset is nonsensical %lu in record at offset %lu\n",
|
||||
(ulong)offs, (ulong)(rec - page));
|
||||
fprintf(stderr,
|
||||
"\nInnoDB: rec address %lx, first buffer frame %lx\n"
|
||||
"InnoDB: buffer pool high end %lx, buf 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 fix count %lu\n",
|
||||
rec, buf_pool->frame_zero,
|
||||
buf_pool->high_end,
|
||||
(ulong)buf_block_align(rec)->buf_fix_count);
|
||||
buf_page_print(page);
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ pars_complete_graph_for_exec(
|
|||
|
||||
/* Struct used to denote a reserved word in a parsing tree */
|
||||
struct pars_res_word_struct{
|
||||
ulint code; /* the token code for the reserved word from
|
||||
int code; /* the token code for the reserved word from
|
||||
pars0grm.h */
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ struct sym_tab_struct{
|
|||
parser */
|
||||
const char* sql_string;
|
||||
/* SQL string to parse */
|
||||
int string_len;
|
||||
size_t string_len;
|
||||
/* SQL string length */
|
||||
int next_char_pos;
|
||||
/* position of the next character in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue