Commit dba31904 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new


tests/mysql_client_test.c:
  Auto merged
parents 951dacdc 2a48132e

mysql-test/t/ctype_utf8.test

+2 −0
Original line number Diff line number Diff line
@@ -785,12 +785,14 @@ INSERT INTO t1 VALUES 
(1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'),

(2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890');



--disable_warnings

CREATE TABLE t2 (

  `msisdn` varchar(15) NOT NULL default '',

  `operator_id` int(11) NOT NULL default '0',

  `created` datetime NOT NULL default '0000-00-00 00:00:00',

  UNIQUE KEY `PK_user` (`msisdn`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--enable_warnings



INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25');

ndb/include/ndb_version.h.in

+10 −2
Original line number Diff line number Diff line
@@ -36,8 +36,16 @@ 
#define MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))



#define NDB_VERSION_D MAKE_VERSION(NDB_VERSION_MAJOR, NDB_VERSION_MINOR, NDB_VERSION_BUILD)



#define NDB_VERSION_STRING (getVersionString(NDB_VERSION, NDB_VERSION_STATUS))

#define NDB_VERSION_STRING_BUF_SZ 100

#ifdef __cplusplus

extern "C"

#else

extern

#endif

char ndb_version_string_buf[NDB_VERSION_STRING_BUF_SZ];

#define NDB_VERSION_STRING (getVersionString(NDB_VERSION, NDB_VERSION_STATUS, \

                                             ndb_version_string_buf, \

                                             sizeof(ndb_version_string_buf)))



#define NDB_VERSION ndbGetOwnVersion()

ndb/include/portlib/NdbTCP.h

+9 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define NDB_NONBLOCK FNDELAY

#define NDB_SOCKET_TYPE int

#define NDB_INVALID_SOCKET -1

#define NDB_CLOSE_SOCKET(x) close(x)

#define _NDB_CLOSE_SOCKET(x) close(x)



/**

 * socklen_t not defined in the header files of OSE
@@ -52,7 +52,7 @@ typedef int socklen_t; 
#define EWOULDBLOCK WSAEWOULDBLOCK

#define NDB_SOCKET_TYPE SOCKET

#define NDB_INVALID_SOCKET INVALID_SOCKET

#define NDB_CLOSE_SOCKET(x) closesocket(x)

#define _NDB_CLOSE_SOCKET(x) closesocket(x)



#else
@@ -64,7 +64,7 @@ typedef int socklen_t; 
#define NDB_NONBLOCK O_NONBLOCK

#define NDB_SOCKET_TYPE int

#define NDB_INVALID_SOCKET -1

#define NDB_CLOSE_SOCKET(x) ::close(x)

#define _NDB_CLOSE_SOCKET(x) ::close(x)



#define InetErrno errno
@@ -89,6 +89,12 @@ extern "C" { 
 */

int Ndb_getInAddr(struct in_addr * dst, const char *address);



#ifdef DBUG_OFF

#define NDB_CLOSE_SOCKET(fd) _NDB_CLOSE_SOCKET(fd)

#else

int NDB_CLOSE_SOCKET(int fd);

#endif



#ifdef	__cplusplus

}

#endif

ndb/include/transporter/TransporterRegistry.hpp

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ public: 
  };

  Vector<Transporter_interface> m_transporter_interface;

  void add_transporter_interface(const char *interf, unsigned short port);



  struct in_addr get_connect_address(NodeId node_id) const;

protected:

  

private:

ndb/include/util/SocketServer.hpp

+7 −1
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ public: 
  protected:

    friend class SocketServer;

    friend void* sessionThread_C(void*);

    Session(NDB_SOCKET_TYPE sock): m_socket(sock){ m_stop = m_stopped = false;}

    Session(NDB_SOCKET_TYPE sock): m_socket(sock)

      {

	DBUG_ENTER("SocketServer::Session");

	DBUG_PRINT("enter",("NDB_SOCKET: %d", m_socket));

	m_stop = m_stopped = false;

	DBUG_VOID_RETURN;

      }

    

    bool m_stop;    // Has the session been ordered to stop?

    bool m_stopped; // Has the session stopped?