From: Alexander Barkov
Date: February 10 2011 1:39pm
Subject: bzr commit into mysql-5.5 branch (alexander.barkov:3322) Bug#31384
List-Archive: http://lists.mysql.com/commits/131039
X-Bug: 31384
Message-Id: <201102101339.p1ADdDMm023968@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7913206851788025124=="

--===============7913206851788025124==
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-5.5/ based on revid:mattias.jonsson@stripped

 3322 Alexander Barkov	2011-02-10
      Bug#31384 DATE_ADD() and DATE_SUB() return binary data
      
      An after-fix to workaround different metadata in "mtr --ps" output.

    modified:
      mysql-test/include/ctype_numconv.inc
=== modified file 'mysql-test/include/ctype_numconv.inc'
--- a/mysql-test/include/ctype_numconv.inc	2011-02-10 08:18:08 +0000
+++ b/mysql-test/include/ctype_numconv.inc	2011-02-10 13:38:18 +0000
@@ -1750,12 +1750,15 @@ SELECT
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 --enable_metadata
+# PS protocol gives different "Max length" value for DATETIME.
+--disable_ps_protocol
 SELECT
   DATE_SUB('2007-08-03', INTERVAL 1 DAY) AS field_str1,
   DATE_SUB('2007-08-03 17:33:00', INTERVAL 1 MINUTE) AS field1_str2,
   DATE_SUB(DATE('2007-08-03'), INTERVAL 1 DAY) AS field_date,
   DATE_SUB(CAST('2007-08-03 17:33:00' AS DATETIME), INTERVAL 1 MINUTE) AS field_datetime;
 --disable_metadata
+--enable_ps_protocol
 SELECT
   HEX(DATE_SUB('2007-08-03', INTERVAL 1 MINUTE)) AS field_str1,
   HEX(DATE_SUB('2007-08-03 17:33:00', INTERVAL 1 MINUTE)) AS field1_str2,


--===============7913206851788025124==
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\
#   9sxqewix0fg8c50j
# target_branch: file:///home/bar/mysql-bzr/mysql-5.5/
# testament_sha1: 0692be27baba6cd1a81482170aa802cffabce928
# timestamp: 2011-02-10 16:39:13 +0300
# source_branch: file:///home/bar/mysql-bzr/mysql-5.1.b59149/
# base_revision_id: mattias.jonsson@stripped\
#   dpvxd2g978xag4sh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTGUkPYAAYhfgAAQWGP/93Yi
TgC////wUAPadveDeclSw4GSBJ6CZKexT9CG1KZHpih+iR6eUmgZICYTEIyap+mqANAfqEYhoBkJ
ogTTU9GmSaMmCGg0aAAGVPVGmmn6k0DINGCBpppoaAZASSmUYp+oYJPKPU009BGJmppoDRo21X8Q
nLiLObLKyBohjixAe5w0lC3/HpR729+CIhfkZQkQTJuazBGMGkwb+r5q0+dG9x4Zu3t+dtg1plQo
BqcN9lMM/LHxn0C/RRCJHPLJsfUOC4hkBSKQRgwHnWUvxi/fXcj6s5+TigBSRtOk5HVZgtk6mJ0C
hhZghvoCEJwhAQwiFIiUYRVYwvMDkDrNeJXawZwXqI4IuygSBewoAnBu7jJE4RgHPqjwaqXuFPsW
glOfU7mPHjMYkM4mTx6kyF+vSt45v92tHjUAr5YgG+bnrogDxGl555MbAx4SAPWgKtcxzuTANKCe
m0HuxRyCSbJgG/I+nTAUMVA8pCrSrC+dzOpuqrNTrl9axGsek1ZboFWZSRs4UQNYoWsoCCNmVhpr
pKBkFhRgg5ygGOQGClDMFVypZGMC+WQMKB4mZ3YLgi3ZQMMWiXCVcMwM089y1hsSrC1HU1sHdikU
iJASilvYN9+3NSyjDKP3kKE6dTxn0SYBBr6Ncs/z3k0AzqdpRqM3hBVLYEJ7BAndYCAcv9c2STt0
JHASsiNncvkAhvFgRWntwpo1Qgg9p0X5QOEsFpNQwXR7x+0hf6D6B3EDCWV+eXpAfuRSuQ+a6E5w
FYRQlrlZkiL7VCRksWurwaM0z1DbxWNguHA7LZS95uUNoY4wW3I2uIDMQ4du6F93s+pQBd5VwVdh
u9W3sEVSygbCoNlhhdyYlyQ/c8iP+FCE/INqZWUsgyxSljVR214WJUdBQQPT6Te2ctHacZFyhJOA
sHrhxsqvWcaUiopODSaha0iS5+3EOAoQTtmmCSMmZNLJxTPzBOojGWbFHwDFzrodQGJu8Ldc38LB
nzIna6hdpZUDIPJaLQgEIgukSGMR2cs6Bbxmle3mNfKkEZos4GU9NS6qUhe9zhz6sX56hXQ0m2do
FCJWoCkB1ebVAsTBDnLFjj2gU3Eng50FFtMC4l/EiYDqY6mPkKpAZOsgYY2vRCw/DLdThHKJr1FV
d50g1iuGFedQDv4wJO6AcivHuUcHsmkQGU21PkAjolJkKwYoI6eZ1xPcoo2FwEWYXJOdecU2FBQR
sDUMqmYTFao9AsQXwGb0+GgTeF7TvYPYZAXmm6nodIm3oNs7D7xxiaUw2WGFABgo1oB8Zh5WC6zi
eCwgaHUXgrMOQFDYODhGI7Yf8XckU4UJAxlJD2A=


--===============7913206851788025124==--