From: Alexander Barkov
Date: May 12 2011 12:17pm
Subject: bzr commit into mysql-trunk branch (alexander.barkov:3365) WL#946
List-Archive: http://lists.mysql.com/commits/137201
Message-Id: <201105121217.p4CCHlAC015133@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0650420088659952925=="

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

#At file:///home/bar/mysql-bzr/mysql-trunk-wl946/ based on revid:alexander.barkov@stripped

 3365 Alexander Barkov	2011-05-12
      WL#946 lldiv_t check didn't work for some reasons.
      Trying Windows-specific conditional compilation instead.

    modified:
      include/my_global.h
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2011-05-12 11:57:06 +0000
+++ b/include/my_global.h	2011-05-12 12:17:02 +0000
@@ -1488,6 +1488,7 @@ enum loglevel {
    INFORMATION_LEVEL= 2
 };
 
+#ifdef __WIN__
 #ifndef HAVE_LLDIV_T
 typedef struct
 {
@@ -1495,5 +1496,6 @@ typedef struct
   long long int rem;    /* Remainder.  */
 } lldiv_t;
 #endif
+#endif
 
 #endif /* my_global_h */


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.barkov@stripped\
#   laj4of3n50dyzofv
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk-wl946/
# testament_sha1: 0a3b6db18e91b79387726c8c30a65f0e388a5813
# timestamp: 2011-05-12 16:17:47 +0400
# base_revision_id: alexander.barkov@stripped\
#   vwns3pt87dbls0wc
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWefNwqwAAXVfgAAQWOP/93Il
BIC////wUAOa28Mc0Ur3UCUSNT0Jpg1J7Qk8gpj0o2Kb0o0yNBJQTTTTKYT0p+op+lPUZBp6gAAA
lEEnqAaaDQAA00AAAGKp4TUGQaANA0AAAACSkyDU8pqeUxkZJ6m1DR6mmgBoCxLmmZz9GqSRQskc
lRAWoRXHSuY6EczVVU6cA8uigwFxiZEyr37eEnefv7Kf7Sp9k6uUYpNC7u6yuHNGKh2vKN/jI+4j
SZDLXMViNf1ywCzoxrZIokRWfDF9Y9ML0MUwKrhZ3jRBWz4xL4/K8Qe8GW1IIqdyCJRboCWCUcPN
vGcRW80lnW0RoBrm0iHCiwbI2d+KfEijlCh5nCQiK6y6Ui+0tKWj5s9aTY8QTJRDhgqdsmxg4zkr
qZQ1DpyYtN8KqKC4g8phbAlFcERuZMlnxHbHuKpHF9ZIleSFRrKuQtJ+FDmG4WNhD+azc6AdQmX8
7tv6wiFXmpvEbOtpyo1b9z5/wzdqzXgxLIIj8smlIUXah5Ad6i7AaFXvi6klpJ5SVafGV+/ExNUX
GEH4qWnBGTHOZdJoyDEyDHl4anK/mP1y37YlLtPvmiG6ZyqKuv3Z/T4b3c5h8s6pTXMhz7RFDBLj
8FxkZcjH6b09UQoONMQchK5ktDxMRWfHlNY/gC4d9SOGdIdX1qq8myNRq7mnwvRIzLILIb0W9H8P
Xqn0u5HYGdBLGqIN9CpEKXDurqeXkXFpskxoSRLWNSQPN/pCDgSmO0sj4C3zsXDjmI3jWwE0pS8u
cw2u5y3bfNWTzhHlv3YSeDa9lO6uNeTZsZtRdYeT5Vx/jD2eTJiwpQtdmNmFJQFwKZNdG0ZuZDpE
0bLqJsGrK/G5U+xrE4EfOBghUdU2dM03jzAGFC1BBq32rVpsShmpmSk3jKjS136DSixvzhY2V4LA
Kclj33iQHwWCwBoLbNexTg8HyGLC0WDXSQSGH7QC57OO5eBkE01SIVos2ZfQQa2MZ0hptGyar1Mx
FR9Br1IKCQaxIUbMbbgDnkJFGvPKaG0HYDokJEyEAU1jxD6Ud4TcsHKnrBbc5LazGJw6DZYVhYO3
cT5Wmxs2iKJM10VXEU8bBFPB4BRUrKznNR/WMVQBAOkijwoY9AZBWyy6/ZmHsxKTRfj/n/sqFzuR
oxmeRrDbzUHViEg0g1P3NpdYRoOJsTEiPgOkmlQmDz5hwOj+PYOPfTXEE7xPAcuKes2tgKmhuK//
i7kinChIc+bhVgA=


--===============0650420088659952925==--