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

Fix for gethostbyname_r detection (for solaris).

parent 2f3cfff0

configure.in

+5 −3
Original line number Diff line number Diff line
@@ -610,9 +610,11 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ 
#--------------------------------------------------------------------



AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))

AC_CHECK_FUNC(gethostbyname_r, [], [



AC_CHECK_LIB(nsl_r, gethostbyname_r, [],

    AC_CHECK_LIB(nsl, gethostbyname_r))])

  AC_CHECK_LIB(nsl, gethostbyname_r))

AC_CHECK_FUNC(gethostbyname_r)



AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))

AC_CHECK_FUNC(yp_get_default_domain, ,

  AC_CHECK_LIB(nsl, yp_get_default_domain))

mysql-test/r/innodb.result

+5 −5
Original line number Diff line number Diff line
@@ -168,9 +168,9 @@ Table Op Msg_type Msg_text 
test.t1	optimize	error	The handler for the table doesn't support check/repair

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	id	A	NULL	NULL	NULL		BTREE	

t1	1	parent_id	1	parent_id	A	NULL	NULL	NULL		BTREE	

t1	1	level	1	level	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	1	id	A	87	NULL	NULL		BTREE	

t1	1	parent_id	1	parent_id	A	43	NULL	NULL		BTREE	

t1	1	level	1	level	A	8	NULL	NULL		BTREE	

drop table t1;

CREATE TABLE t1 (

gesuchnr int(11) DEFAULT '0' NOT NULL,
@@ -211,7 +211,7 @@ Table Op Msg_type Msg_text 
test.t1	analyze	error	The handler for the table doesn't support check/repair

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	skr	1	a	A	NULL	NULL	NULL	YES	BTREE	

t1	1	skr	1	a	A	3	NULL	NULL	YES	BTREE	

drop table t1;

create table t1 (a int,b varchar(20),key(a)) type=innodb;

insert into t1 values (1,""), (2,"testing");
@@ -727,7 +727,7 @@ Table Op Msg_type Msg_text 
test.t1	optimize	error	The handler for the table doesn't support check/repair

show keys from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	a	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	1	a	A	2	NULL	NULL		BTREE	

drop table t1;

create table t1 (i int, j int ) TYPE=innodb;

insert into t1 values (1,2);

sql/mysql_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); 
#define OPTION_LOW_PRIORITY_UPDATES	8192

#define OPTION_WARNINGS		16384

#define OPTION_AUTO_IS_NULL	32768

#define OPTION_ANSI_MODE	65536L

#define OPTION_SAFE_UPDATES	OPTION_ANSI_MODE*2

#define OPTION_FOUND_COMMENT	65536L

#define OPTION_SAFE_UPDATES	OPTION_FOUND_COMMENT*2

#define OPTION_BUFFER_RESULT	OPTION_SAFE_UPDATES*2

#define OPTION_BIN_LOG          OPTION_BUFFER_RESULT*2

#define OPTION_NOT_AUTO_COMMIT	OPTION_BIN_LOG*2
@@ -181,7 +181,7 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); 
#define SELECT_NO_UNLOCK	(QUERY_NO_GOOD_INDEX_USED*2)

#define TMP_TABLE_ALL_COLUMNS	(SELECT_NO_UNLOCK*2)





/* Bits for different SQL modes modes (including ANSI mode) */

#define MODE_REAL_AS_FLOAT      	1

#define MODE_PIPES_AS_CONCAT    	2

#define MODE_ANSI_QUOTES        	4