bzr push into mysql-5.5 branch (alexander.barkov:3321 to 3322) Bug#31384

[Alexander Barkov]

 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
 3321 Mattias Jonsson	2011-02-10
      bug#59085 recommit

    modified:
      sql/sql_load.cc
=== 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,

No bundle (reason: useless for push emails).