Commit bbebc751 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge with 3.23.51

parents 7a436e6a 6d0e43c7

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -49813,6 +49813,9 @@ not yet 100% confident in this code. 














@itemize @bullet















@item













Remove end space from @code{enum} values. (This fixed a problem with













@code{SHOW CREATE TABLE}).













@item















Fixed bug in @code{CONCAT_WS()} that cut the result.















@item















Changed name of variables @code{Com_show_master_stat} to

























extra/resolveip.c



+0
−5






























Original line number
Diff line number
Diff line








@@ -32,11 +32,6 @@













#include <netdb.h>















#include <my_getopt.h>





























#ifdef SCO













#undef h_errno













#define h_errno errno













#endif





























#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)















extern int h_errno;















#endif

































include/my_net.h



+19
−13






























Original line number
Diff line number
Diff line








@@ -71,19 +71,22 @@ void my_inet_ntoa(struct in_addr in, char *buf);













  Handling of gethostbyname_r()















*/





























#if defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)















#if !defined(HPUX)















struct hostent;















#endif /* HPUX */













#if !defined(HAVE_GETHOSTBYNAME_R)













struct hostent *my_gethostbyname_r(const char *name,













				   struct hostent *result, char *buffer,













				   int buflen, int *h_errnop);













void my_gethostbyname_r_free();













#elif defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)















struct hostent *my_gethostbyname_r(const char *name,















				   struct hostent *result, char *buffer,















				   int buflen, int *h_errnop);















#define my_gethostbyname_r_free()













#if defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)













#define GETHOSTBYNAME_BUFF_SIZE 2048













#else













#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)















#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)













#endif /* defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */













#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */































#elif defined(HAVE_GETHOSTBYNAME_R_RETURN_INT)















#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)









@@ -91,17 +94,20 @@ struct hostent *my_gethostbyname_r(const char *name,













				   struct hostent *result, char *buffer,















				   int buflen, int *h_errnop);















#define my_gethostbyname_r_free()













#elif !defined(HAVE_GETHOSTBYNAME_R)













#define GETHOSTBYNAME_BUFF_SIZE 2048













struct hostent *my_gethostbyname_r(const char *name,













				   struct hostent *result, char *buffer,













				   int buflen, int *h_errnop);













void my_gethostbyname_r_free();















#else













#define GETHOSTBYNAME_BUFF_SIZE 2048















#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E))















#define my_gethostbyname_r_free()













#endif /* defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */













#endif /* !defined(HAVE_GETHOSTBYNAME_R) */



























#ifndef GETHOSTBYNAME_BUFF_SIZE













#define GETHOSTBYNAME_BUFF_SIZE 2048













#endif



























/* On SCO you get a link error when refering to h_errno */













#ifdef SCO













#undef h_errno













#define h_errno errno













#endif































C_MODE_END















#endif
























include/my_sys.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -591,7 +591,7 @@ extern int my_sortncmp(const char *s,uint s_len, const char *t,uint t_len);













extern WF_PACK *wf_comp(my_string str);















extern int wf_test(struct wild_file_pack *wf_pack,const char *name);















extern void wf_end(struct wild_file_pack *buffer);













extern size_s stripp_sp(my_string str);













extern size_s strip_sp(my_string str);















extern void get_date(my_string to,int timeflag,time_t use_time);















extern void soundex(my_string out_pntr, my_string in_pntr,pbool remove_garbage);















extern int init_record_cache(RECORD_CACHE *info,uint cachesize,File file,

































mysql-test/r/type_set.result
0 → 100644



+8
−0






























Original line number
Diff line number
Diff line













Table	Create Table













t1	CREATE TABLE `t1` (













  `a` set('','a','b') NOT NULL default ''













) TYPE=MyISAM













Table	Create Table













t1	CREATE TABLE `t1` (













  `a` set('','a','b') NOT NULL default 'b'













) TYPE=MyISAM