From a726555523a0ce00d250224b726a9332f593c0a7 Mon Sep 17 00:00:00 2001 From: Alexander Barkov <alexander.barkov@oracle.com> Date: Thu, 10 Feb 2011 16:38:18 +0300 Subject: [PATCH] Bug#31384 DATE_ADD() and DATE_SUB() return binary data An after-fix to workaround different metadata in "mtr --ps" output. --- mysql-test/include/ctype_numconv.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/include/ctype_numconv.inc b/mysql-test/include/ctype_numconv.inc index 974951b6b6f..571b8207107 100644 --- a/mysql-test/include/ctype_numconv.inc +++ b/mysql-test/include/ctype_numconv.inc @@ -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,