merge

include/typelib.h

@@ -29,7 +29,7 @@ typedef struct st_typelib {	/* Different types saved here */
 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);