Commit c9e0f2f8 authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime 

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
parents afac8bcc 66fcdd54

include/mysql_h.ic

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ extern TYPELIB * copy_typelib(MEM_ROOT * root, TYPELIB * from); 
# 415 "mysql_com.h"

extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st);

# 30 "typelib.h"

extern int find_type(char * x, TYPELIB * typelib, unsigned int);

extern int find_type(char * x, const TYPELIB * typelib, unsigned int);

# 429 "mysql_com.h"

extern void get_salt_from_password(unsigned char * res, char const * password);

# 422 "mysql_com.h"

include/typelib.h

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ typedef struct st_typelib { /* Different types saved here */ 
  unsigned int *type_lengths;

} TYPELIB;



extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);

extern int find_type(const char *x, const TYPELIB *typelib,

                     unsigned int full_name);

extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);

extern const char *get_type(TYPELIB *typelib,unsigned int nr);

extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);

mysys/typelib.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
    >0  Offset+1 in typelib for matched string

*/



int find_type(my_string x, TYPELIB *typelib, uint full_name)

int find_type(const char *x, const TYPELIB *typelib, uint full_name)

{

  int find,pos,findpos;

  reg1 my_string i;

sql/mysql_priv.h

+4 −2
Original line number Diff line number Diff line
@@ -1561,8 +1561,10 @@ extern bool check_reserved_words(LEX_STRING *name); 
/* strfunc.cc */

ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,

		   char **err_pos, uint *err_len, bool *set_warning);

uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match);

uint find_type2(TYPELIB *lib, const char *find, uint length, CHARSET_INFO *cs);

uint find_type(const TYPELIB *lib, const char *find, uint length,

               bool part_match);

uint find_type2(const TYPELIB *lib, const char *find, uint length,

                CHARSET_INFO *cs);

void unhex_type2(TYPELIB *lib);

uint check_word(TYPELIB *lib, const char *val, const char *end,

		const char **end_of_word);

sql/strfunc.cc

+4 −2
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs, 
  > 0 position in TYPELIB->type_names +1

*/



uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match)

uint find_type(const TYPELIB *lib, const char *find, uint length,

               bool part_match)

{

  uint found_count=0, found_pos=0;

  const char *end= find+length;
@@ -144,7 +145,8 @@ uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match) 
    >0  Offset+1 in typelib for matched string

*/



uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs)

uint find_type2(const TYPELIB *typelib, const char *x, uint length,

                CHARSET_INFO *cs)

{

  int pos;

  const char *j;