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

--===============2979872109385468905==
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-13
      WL#946 Fixing --ps test failures

    modified:
      libmysql/libmysql.c
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2011-05-12 20:55:23 +0000
+++ b/libmysql/libmysql.c	2011-05-12 22:33:11 +0000
@@ -3469,7 +3469,7 @@ static void fetch_datetime_with_conversi
       fetch_string_with_conversion:
     */
     char buff[MAX_DATE_STRING_REP_LENGTH];
-    uint length= my_TIME_to_str(my_time, buff, 0); // TODO?
+    uint length= my_TIME_to_str(my_time, buff, field->decimals);
     /* Resort to string conversion */
     fetch_string_with_conversion(param, (char *)buff, length);
     break;
@@ -3946,7 +3946,7 @@ static my_bool setup_one_fetch_function(
     field->max_length= MAX_DOUBLE_STRING_REP_LENGTH;
     break;
   case MYSQL_TYPE_TIME:
-    field->max_length= 15;                    /* 19:23:48.123456 */
+    field->max_length= 17;                    /* -819:23:48.123456 */
     param->skip_result= skip_result_with_length;
     break;
   case MYSQL_TYPE_DATE:


--===============2979872109385468905==
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\
#   c8fn5w0lu87hd71a
# target_branch: file:///home/bar/mysql-bzr/mysql-trunk-wl946/
# testament_sha1: 9814cd028204237692da8da57fd0fe118415f922
# timestamp: 2011-05-13 02:33:25 +0400
# base_revision_id: alexander.barkov@stripped\
#   xpxujqet4gq5c8xh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRafxOoAAaH/gEAQQABYd///
cyYEgL////BQA7p5102973vXcdLthKQSMU8ieJiammNNT9SABtI2o9NR6gSkTTSJ7IT0yieU8p6g
AMmgANAGgg0hGNTU8o8oBkA0BpoAAieqhsk09TJppkaMI0MmmhpkyBo00EkkxTBPSaeppkU9MmU9
IwRoZAHqNFFuW9Wm3pGzRG4C/GecgPfLKLPVySsBBBZGHhhudsjM05cQvbA5ZWqxbWRNVhzXugV8
fWPJ6OSBSVKNOvRLJslhRakOGqLZHY2a5cZeIZ2TGYqE1TtgPvx0w1OCWmLQiGRJUjh26b7YbOdk
UrGbcPeUG4Q2pjx69pQIhNgeTKFsrUVU/4WPhA/opBJlAVXH6VFbEBGJX2ZxQETMqgiG1rXTypfJ
HVG58h2EK8M2JXq0EivSIwusyILM0VWIpvDIgIcKzIHveJqNe2i8cZnUBSVcCog7EkwBGhgsTwJ+
YIFEJ1XSMMUo42Pwge7TQ1qQEoKVc4kImcoLi46cQ1HdVBIYGY121PDE9hgTHUxTdQXyDpoOMeA4
Vtz5EsFwgY7ciZmL71ODwtFMEUcTxbWUULRUwlRXM2BNTw2FN8PwR9NT35xBQQsxiYtZvKTxcWcI
8ZlSRCAQpUvsRVY5IpCBrMHy3iCAYHGAlSI6BOhM5RFC2l1q+CildlHQxi2JVAMqO5l7OeGH5B6y
TQoY20NLsuelB4H9Zif1vBEHstdbMzwdukOo3jO6enXjrdViC870eWpIiDuR6JGBaEuvkidLjrou
M4msNqouvgtSIUohVKfYOXgsswcWdT6kyBa2JdDyN0Pl4BTxFOwS5p5GAWfbUg06oXqMEZgLWbn8
V6pNarTPGLrVLkstKzkNiKRliCeRKN91G9qnV6AwIgRqNkoHE6WFpx30Pj6+t3SZMPDayfcOE2tN
9IpmmSMzgoGJSNY6wPMXeq2kEeDZ9oNb3eSbEjxOooU9EFq+wSun0ynDAJcwu9X4bHFgaMG3GsMQ
WvYckbQrC1x2MFVaQxXl6+xI3fNh2Ol1vMVd5qSHa7i6lbJBkMWe8W8HQpk0BCoEgirgDAJUF4na
qkMyZZuN28hRkCiHdE9UiAUrvcreYKe9XzZlQQzaH3+BYdgeG0PiGdGl5hjpcAXJLJ6Lrt8z0KeU
QCkVC3Pc4yReN1bqcTF8lAPSIlxcuw6yFBUAMddXSThMu4Zit1qaLzNHJ7xUHA9FKi1aRpEjv6TX
AMarKbgViwCo3i98S7UeGFILxCcQoVYSXIsGQ0RDV/i7kinChIC0/idQ


--===============2979872109385468905==--