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

into  mysql.com:/usr/local/mysql/mysql-5.1-new

include/my_global.h

@@ -961,6 +961,7 @@ typedef off_t os_off_t;
 #define SOCKET_EAGAIN	WSAEINPROGRESS
 #define SOCKET_ETIMEDOUT WSAETIMEDOUT
 #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
+#define SOCKET_EADDRINUSE WSAEADDRINUSE
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
 #elif defined(OS2)
@@ -969,6 +970,7 @@ typedef off_t os_off_t;
 #define SOCKET_EAGAIN	SOCEINPROGRESS
 #define SOCKET_ETIMEDOUT SOCKET_EINTR
 #define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
+#define SOCKET_EADDRINUSE SOCEADDRINUSE
 #define SOCKET_ENFILE	SOCENFILE
 #define SOCKET_EMFILE	SOCEMFILE
 #define closesocket(A)	soclose(A)
@@ -979,6 +981,7 @@ typedef off_t os_off_t;
 #define SOCKET_EAGAIN	EAGAIN
 #define SOCKET_ETIMEDOUT SOCKET_EINTR
 #define SOCKET_EWOULDBLOCK EWOULDBLOCK
+#define SOCKET_EADDRINUSE EADDRINUSE
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
 #endif

sql/mysqld.cc

@@ -1489,7 +1489,7 @@ static void network_init(void)
     {
       if (((ret= bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),
                       sizeof(IPaddr))) >= 0) ||
-          (socket_errno != EADDRINUSE) ||
+          (socket_errno != SOCKET_EADDRINUSE) ||
           (waited >= mysqld_port_timeout))
         break;
       sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port);

storage/csv/Makefile.am

@@ -29,6 +29,7 @@ WRAPLIBS=
 pkglib_LTLIBRARIES =	ha_csv.la
 
 ha_csv_la_LDFLAGS =	-module
+noinst_HEADERS	  =	ha_tina.h
 ha_csv_la_SOURCES =	ha_tina.cc
 
 LDADD =

storage/example/Makefile.am

@@ -29,6 +29,7 @@ WRAPLIBS=
 pkglib_LTLIBRARIES =	ha_example.la
 
 ha_example_la_LDFLAGS =	-module
+noinst_HEADERS	      =	ha_example.h
 ha_example_la_SOURCES =	ha_example.cc
 
 LDADD =