mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Merge bb-10.2-ext into 10.3
This commit is contained in:
@@ -277,23 +277,23 @@ struct st_mysql_const_lex_string
|
||||
};
|
||||
typedef struct st_mysql_const_lex_string MYSQL_CONST_LEX_STRING;
|
||||
extern struct thd_alloc_service_st {
|
||||
void *(*thd_alloc_func)(void*, unsigned int);
|
||||
void *(*thd_calloc_func)(void*, unsigned int);
|
||||
void *(*thd_alloc_func)(void*, size_t);
|
||||
void *(*thd_calloc_func)(void*, size_t);
|
||||
char *(*thd_strdup_func)(void*, const char *);
|
||||
char *(*thd_strmake_func)(void*, const char *, unsigned int);
|
||||
void *(*thd_memdup_func)(void*, const void*, unsigned int);
|
||||
char *(*thd_strmake_func)(void*, const char *, size_t);
|
||||
void *(*thd_memdup_func)(void*, const void*, size_t);
|
||||
MYSQL_CONST_LEX_STRING *(*thd_make_lex_string_func)(void*,
|
||||
MYSQL_CONST_LEX_STRING *,
|
||||
const char *, unsigned int, int);
|
||||
const char *, size_t, int);
|
||||
} *thd_alloc_service;
|
||||
void *thd_alloc(void* thd, unsigned int size);
|
||||
void *thd_calloc(void* thd, unsigned int size);
|
||||
void *thd_alloc(void* thd, size_t size);
|
||||
void *thd_calloc(void* thd, size_t size);
|
||||
char *thd_strdup(void* thd, const char *str);
|
||||
char *thd_strmake(void* thd, const char *str, unsigned int size);
|
||||
void *thd_memdup(void* thd, const void* str, unsigned int size);
|
||||
char *thd_strmake(void* thd, const char *str, size_t size);
|
||||
void *thd_memdup(void* thd, const void* str, size_t size);
|
||||
MYSQL_CONST_LEX_STRING
|
||||
*thd_make_lex_string(void* thd, MYSQL_CONST_LEX_STRING *lex_str,
|
||||
const char *str, unsigned int size,
|
||||
const char *str, size_t size,
|
||||
int allocate_lex_string);
|
||||
extern struct thd_autoinc_service_st {
|
||||
void (*thd_get_autoinc_func)(const void* thd,
|
||||
|
Reference in New Issue
Block a user