diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-10 15:47:39 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-10 15:47:39 +0200 |
| commit | c3b467c41f38cea364d883d03e8c9b7721188b2d (patch) | |
| tree | 3d42259b27e4b2e868b756975ed5e0f8416d6dd9 | |
| parent | a764e00bfc51b67c3a97edd067c27c3810ba2174 (diff) | |
| parent | eeaccb4fbf7b70f58ef31e3ceeb294dcdb37c31f (diff) | |
| download | mariadb-git-c3b467c41f38cea364d883d03e8c9b7721188b2d.tar.gz | |
merge mysql-5.5->mysql-5.5-security
| -rw-r--r-- | mysql-test/include/ctype_numconv.inc | 3 |
1 files changed, 3 insertions, 0 deletions
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, |