diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-10 13:39:37 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-10 13:39:37 +0200 |
commit | 46465327e796e6c3d9a89dcfb9ba71561fafdb05 (patch) | |
tree | ef3daf4878407d9feda5c433af6bd6dd0a01e510 /include/mysql.h.pp | |
parent | 03b4c3bcdee02e3a6d5a53374197d7fa99dcbd74 (diff) | |
download | mariadb-git-46465327e796e6c3d9a89dcfb9ba71561fafdb05.tar.gz |
merge
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r-- | include/mysql.h.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index f9f38b67f96..6e71f886eba 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -224,7 +224,7 @@ 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 uint find_type_or_exit(const char *x, TYPELIB *typelib, +extern unsigned int find_type_or_exit(const char *x, TYPELIB *typelib, const char *option); extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); |