diff options
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/mem0mem.ic | 2 | ||||
| -rw-r--r-- | innobase/include/page0page.ic | 8 | ||||
| -rw-r--r-- | innobase/include/pars0pars.h | 2 | ||||
| -rw-r--r-- | innobase/include/pars0sym.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic index 714c30e3642..82d88099c3f 100644 --- a/innobase/include/mem0mem.ic +++ b/innobase/include/mem0mem.ic @@ -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++; diff --git a/innobase/include/page0page.ic b/innobase/include/page0page.ic index 3d2bf3b090e..c7bf78040e9 100644 --- a/innobase/include/page0page.ic +++ b/innobase/include/page0page.ic @@ -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); diff --git a/innobase/include/pars0pars.h b/innobase/include/pars0pars.h index 28985e2f9d0..62a41a881e8 100644 --- a/innobase/include/pars0pars.h +++ b/innobase/include/pars0pars.h @@ -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 */ }; diff --git a/innobase/include/pars0sym.h b/innobase/include/pars0sym.h index a40523861dd..633a49e3cb5 100644 --- a/innobase/include/pars0sym.h +++ b/innobase/include/pars0sym.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 |