database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-06 19:08:06 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-12-22 12:23:39 +02:00
parent a76a2522ec 461cf3e5a3
commit 985d2d393c
87 changed files with 1806 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql.h.pp
View File

@@ -249,8 +249,6 @@ typedef struct st_typelib {
extern my_ulonglong find_typeset(char *x, TYPELIB *typelib,int *error_position);
extern int find_type_with_warning(const char *x, TYPELIB *typelib,
const char *option);
extern int find_type_or_exit(const char *x, TYPELIB *typelib,
const char *option);
extern int find_type(const char *x, const TYPELIB *typelib, unsigned int flags);
extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
extern const char *get_type(TYPELIB *typelib,unsigned int nr);