Commit d0a8a628 authored Sep 15, 2006 by unknown

Merge bk-internal:/home/bk/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

parents 39f28ab6 b6790974

include/my_net.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,14 @@ C_MODE_START

		#if defined(__WIN__)
		#define O_NONBLOCK 1 /* For emulation of fcntl() */

		/*
		SHUT_RDWR is called SD_BOTH in windows and
		is defined to 2 in winsock2.h
		#define SD_BOTH 0x02
		*/
		#define SHUT_RDWR 0x02

		#endif

		/*

mysql-test/t/disabled.def

+0 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,5 @@ rpl_sp_effects : BUG#19862 2006-06-15 mkindahl
		#rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
		crash_commit_before : 2006-08-02 msvensson
		rpl_ndb_dd_advance : BUG#18679 2006-07-28 jimw (Test fails randomly)
		func_group : BUG#21924 2006-08-30 reggie
		func_in : BUG#21925 2006-08-30 reggie
		ndb_binlog_discover : bug#21806 2006-08-24
		ndb_autodiscover3 : bug#21806