database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-13384 Fix Windows warnings. thd_alloc functions now use size_t parameters

Browse Source 
Fixes some warnings in popular headers.
This commit is contained in:
Vladislav Vaintroub
2017-09-28 10:36:00 +00:00
parent eba44874ca
commit 509928718d
9 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.cc
View File

@ -1156,13 +1156,13 @@ Sql_condition* THD::raise_condition(uint sql_errno,
}
extern "C"
void *thd_alloc(MYSQL_THD thd, unsigned int size)
void *thd_alloc(MYSQL_THD thd, size_t size)
{
return thd->alloc(size);
}
extern "C"
void *thd_calloc(MYSQL_THD thd, unsigned int size)
void *thd_calloc(MYSQL_THD thd, size_t size)
{
return thd->calloc(size);
}
@ -1174,14 +1174,14 @@ char *thd_strdup(MYSQL_THD thd, const char *str)
}
extern "C"
char *thd_strmake(MYSQL_THD thd, const char *str, unsigned int size)
char *thd_strmake(MYSQL_THD thd, const char *str, size_t size)
{
return thd->strmake(str, size);
}
extern "C"
LEX_STRING *thd_make_lex_string(THD *thd, LEX_STRING *lex_str,
const char *str, unsigned int size,
const char *str, size_t size,
int allocate_lex_string)
{
return allocate_lex_string ? thd->make_lex_string(str, size)
@ -1189,7 +1189,7 @@ LEX_STRING *thd_make_lex_string(THD *thd, LEX_STRING *lex_str,
}
extern "C"
void *thd_memdup(MYSQL_THD thd, const void* str, unsigned int size)
void *thd_memdup(MYSQL_THD thd, const void* str, size_t size)
{
return thd->memdup(str, size);
}