From: Christopher Powers
Date: August 14 2010 10:07pm
Subject: bzr commit into mysql-next-mr-wl4896 branch (chris.powers:3164)
List-Archive: http://lists.mysql.com/commits/115742
Message-Id: <20100814220754.8F7BE1DB0316@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0598987551737509920=="

--===============0598987551737509920==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/cpowers/work/dev/dev-wl4896/mysql/ based on revid:chris.powers@stripped

 3164 Christopher Powers	2010-08-14
      merge bugfix

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-08-14 21:30:27 +0000
+++ b/sql/mysqld.cc	2010-08-14 22:07:49 +0000
@@ -1925,7 +1925,7 @@ static void network_init(void)
     (void) mysql_socket_setsockopt(unix_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&arg,
 		      sizeof(arg));
     umask(0);
-    if (bind(mysql_socket_getfd(unix_sock), my_reinterpret_cast(struct sockaddr *) (&UNIXaddr),
+    if (bind(mysql_socket_getfd(unix_sock), reinterpret_cast<struct sockaddr *> (&UNIXaddr),
 	     sizeof(UNIXaddr)) < 0)
     {
       sql_perror("Can't start server : Bind on unix socket"); /* purecov: tested */


--===============0598987551737509920==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/chris.powers@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/dev-wl4896/mysql/
# testament_sha1: 35bccde30072321e64504ed93eb2538080997832
# timestamp: 2010-08-14 17:07:53 -0500
# base_revision_id: chris.powers@stripped\
#   upy45r64d81uvb6g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSLVkJwAAXJfgEAQUXf/91oh
QkC////wUANjb20cdC3tewSiJMmABNTxT1TwmCn4pppo1N6kYglQKeKemieRTajBGIYCBiYgwSSA
mpNtCnqZGhkyAAAAAMlMnqnpPSaGmg0AAAAAAElFTxiKeBJ6niTI2RB6gaAA0MitgX27nWyhCRYQ
KrBljWMjRkPm9/J8p1VTv2TNx5SbYrWNzg7Hf795NC3KRKV2TzR27+aMVDZakhqlncvIYjMQztpu
M7hLJawaalalqIXIhNDpcr2aBL1riGiEVvQIcPXTUoF0DMdVGoKgiZBSXHB1BOtW0MuJ4Igk7xuC
SlybW6mS90wvfaIiBh0jXS9u3aqrN3IUMLSgon+bWn4KYHiJxcgQYKLRfhQGFTL7YSErpTQ9GwTz
PMgiRrulDPEjhhoyTT2EPYy6QiqsKFqXFGOQOjkk+GQ/Z+IUQHpIoPRsLwVNT4RrCxWByG1qtRHA
lqDKJsKVcEBruyl6eKCy66uVIbu6RHqBdYIvhYEcxYOptylDJv3lMDETh05rG5xcbn6J5eWlSsBp
j7XNC1FazaM8ryVj01jSJBOxse05zF/hS1Td6+vlzRB0gUU78W/HzL75zkyvIQ9Gn6vaG0v/GX9O
aIfv/RxuB1llbzfQhtTlv6hjudFTt5ia79oOpyJMDDFch36jOiP3GyH0fu8ZwxMhWfOnU6oxEI0Q
0QRQUdOpVm8V2V9MFrjTAa6Jb5nDTAbWuUxHj+Bb/Da0IpBtGFLcOE1fJjH9IY7R+DLJ1XsrMcD2
jvWOg/rR4eRUmsdpq2M8AS67QPz1MB5HNFZ4S67C02lcGDgQFJNx8saHyC9w4msTcSFe/giguPKn
jaawiqaiH3UlPipIU/EiK59WkqNK8NwRRel9DlITIhyBd9EjhovaagdWoJzAWbQeD2i4g2OSGDbB
aqdT+cRWJjFHYQLr5aZSJ5u7hIZLA0WPQ9o27MmJFkzJlrK3dgs6npFkAuA0tDfpIQCI5IDU/MJE
bzWmRCwLcRd5ImhndQZEYdqMmTil3XaWtXkFKSxskQ6jGIebfAF0BomnrnV7gSrUNe6SEJDJYZHo
IqACKZYJExcUd6IhYmFAa0yLmayS3i/YYma5GpvwbLtttRaUoKASxSJ644ubdm+4M9gYilCU41YF
5AqBaScVRkOTTAsUA2omLZIDH2ED/F3JFOFCQItWQnA=


--===============0598987551737509920==--