summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-07-10 13:41:30 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2011-07-10 13:41:30 +0200
commit7ff45c1379472953074318623017ccb7a66b8426 (patch)
tree989b4c003bc37ff5a179441caad3349e39dcda0b /include/mysql.h.pp
parent066fb9d289112ecb858c8557b947423b7b4fe55d (diff)
parent46465327e796e6c3d9a89dcfb9ba71561fafdb05 (diff)
downloadmariadb-git-7ff45c1379472953074318623017ccb7a66b8426.tar.gz
merge
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r--include/mysql.h.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 2ad38bbf82e..659f30a2a67 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -225,7 +225,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);