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

--===============5822802736305971289==
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

 3366 Alexander Barkov	2011-05-12
      WL#946
      Fixing warnings: converting to 'long long int' from 'double'

    modified:
      sql/field.cc
=== modified file 'sql/field.cc'
--- a/sql/field.cc	2011-05-12 11:57:06 +0000
+++ b/sql/field.cc	2011-05-12 12:58:20 +0000
@@ -5052,7 +5052,7 @@ int Field_datetime_common::store(double 
   int warnings= 0;
   lldiv_t lld;
   lld.quot= (longlong) trunc(nr);
-  lld.rem= round((nr - (double) lld.quot) * 1000000000);
+  lld.rem= (longlong) double2ulonglong(round((nr - (double) lld.quot) * 1000000000));
   int error= Field_temporal::store_lldiv_t(&lld, &warnings);
   if (warnings)
     set_warnings(nr, warnings);
@@ -5578,7 +5578,7 @@ int Field_time_common::store(double nr)
   int warnings= 0;
   lldiv_t lld;
   lld.quot= (longlong) trunc(nr);
-  lld.rem= round((nr - (double) lld.quot) * 1000000000);
+  lld.rem= (longlong) double2ulonglong(round((nr - (double) lld.quot) * 1000000000));
   int error= Field_temporal::store_lldiv_t(&lld, &warnings);
   if (warnings)
     set_warnings(nr, warnings);


--===============5822802736305971289==
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\
#   o7zrpa7k3s0lvsxk
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk-wl946/
# testament_sha1: f4d595c0e8a10d49b2662e4d77ceca677b337e15
# timestamp: 2011-05-12 16:58:44 +0400
# base_revision_id: alexander.barkov@stripped\
#   laj4of3n50dyzofv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUFFTLAAAZtfgAIQWPP//3ME
AIC////wUAPV7jm2u67ZBzW8JJENRo1MNBkHqRtExNB6mg0AJKKPQmMpmqfpMSG1A0aANABoJKGk
aaap4mIp+SQ/KJ6mgD1BoBoYAAAADQAAAAAJJFNojDQTCU9NqnplG0anpA9TR6R6lZDXgM3+/mXa
7gvZHCCCONE8HTObpYb4XleweWF3bSzMulofMl3UUvKSQcz3fV7bQelf7Xb0mO0dknZDjQ/LrjQ/
AcwvWOFBUMjiUnKQcQOJYShQbhHtwOpnb6l45i542dOUTRIisUhwYUsautRS2oJ8FAcOOZtAgREO
ZOHuEe/uWpGsZOUUxFXyb9pTBnFQ7brKBI73FgjMy7mEYQaQiCBu2mU5Y+KtuP0+Ez1d447iYqvY
fNTYKGYxjJMFSIuqQotaJmp0M4ZZQJXjsXmqiTrOIz4lidnpHxgNXHgKrREe8rTZOqtkubQSaCt5
WYlEu47WHZFV9hkpViCcRPd6eRpWSE89AcOyQ8r4f0u3qaeb1GdiflTnxY0YuWGm/zvtKySn1Kuy
qxWmlk20iKAp5zQUlFDRZmle1hCeh78ifEyJ0HkMD7WZRicaHSxFZTezGzDstRa5hmdG5w0jJpmk
IBNBuBntKjNkjmoe43e0LUjXPBmTXur3+8lFMiMOjxgzLf8QLfoLv5O5pEmyh4fFRDAxGd286abm
EFWcMCONiRylVRJNtK6l3pDvBHdTFHHew2sdy5Jm6pOjVhjaxiQ4mSIdNM5bsSty5rCUSUrZFa1L
kOmkT3eNkpAFr8D26l5P02q8A82J977stmB1eaZMvDa+Jvd2XQiWXpaOdUmunDjbxtbU689m6uK1
yC4mVSFny0xmhUXAzgoJ+M2X9S6Fj9xGUiUGCy6c9O2+tDipmnTwNyGChvnvMgrJpwvLmxNNfdNQ
pNo5WDyzMJ39NUnlfGWwNweHd+eSrKTFipnYi0vvDAF+jIKAocerGxMnhn6KlIc4bvYC15B9W6dA
ebTTqJ/QXBI5kR0TWo7nmW2HGECVsyaBBDF0thIDgWhzDDANhpkuuH4wihmTKarfXOKbgqTzT8AU
whyEQY8kiYWr2PWJd4IrPAFcYbJhctXOTEt6WtHXpMq6nVjXSDxKiS3qIon33lfSIKSm+fHNNRE0
inJ4MsQtN/ZLTCUxKNEQaC1cvVpus5dRYLNfwHZwf7Tg67Qx612b0HVWBML2es9pIz59pAr3J6sC
gtQXhEsFVAjyfhiTAraROUV4q1UwJVDmL8XckU4UJBBRUywA


--===============5822802736305971289==--