diff options
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 73b9f9f588b..1e4479e8f2b 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -66,6 +66,8 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, MYSQL_TYPE_TIMESTAMP2, MYSQL_TYPE_DATETIME2, MYSQL_TYPE_TIME2, + MYSQL_TYPE_BLOB_COMPRESSED= 140, + MYSQL_TYPE_VARCHAR_COMPRESSED= 141, MYSQL_TYPE_NEWDECIMAL=246, MYSQL_TYPE_ENUM=247, MYSQL_TYPE_SET=248, @@ -137,7 +139,7 @@ typedef struct st_udf_args char **args; unsigned long *lengths; char *maybe_null; - char **attributes; + const char **attributes; unsigned long *attribute_lengths; void *extension; } UDF_ARGS; @@ -163,7 +165,7 @@ void scramble(char *to, const char *message, const char *password); my_bool check_scramble(const unsigned char *reply, const char *message, const unsigned char *hash_stage2); void get_salt_from_password(unsigned char *res, const char *password); -char *octet2hex(char *to, const char *str, unsigned int len); +char *octet2hex(char *to, const char *str, size_t len); char *get_tty_password(const char *opt_message); void get_tty_password_buff(const char *opt_message, char *to, size_t length); const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); @@ -236,9 +238,11 @@ typedef struct st_mem_root USED_MEM *pre_alloc; size_t min_malloc; size_t block_size; + size_t total_alloc; unsigned int block_num; unsigned int first_block_usage; void (*error_handler)(void); + const char *name; } MEM_ROOT; typedef struct st_typelib { unsigned int count; |