Commit aef96fd0 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  example.com:/work/mysql-5.1-runtime
parents 14ecf6d0 d07b5b24

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ void unhex_type2(TYPELIB *lib); 
uint check_word(TYPELIB *lib, const char *val, const char *end,

		const char **end_of_word);

int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle,

                         CHARSET_INFO *cs);

                         CHARSET_INFO * const cs);





bool is_keyword(const char *name, uint len);