bzr commit into mysql-trunk branch (alexander.barkov:3638)

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-trunk/ based on revid:mattias.jonsson@stripped

 3638 Alexander Barkov	2011-02-10 [merge]
      Merging from 5.1.

    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:47:05 +0000
+++ b/mysql-test/include/ctype_numconv.inc	2011-02-10 13:41:16 +0000
@@ -1762,12 +1762,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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).