From: Mattias Jonsson
Date: January 10 2011 2:14pm
Subject: bzr commit into mysql-5.5 branch (mattias.jonsson:3226)
List-Archive: http://lists.mysql.com/commits/128307
Message-Id: <201101101416.p0AEGWqV023153@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/mattiasj/mysql-bzr/topush-5.5/ based on revid:vasil.dimov@stripped

 3226 Mattias Jonsson	2011-01-10 [merge]
      Manual merge from 5.1

    modified:
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      sql/item.h
      sql/item_func.h
      sql/item_timefunc.h
      sql/sql_partition.cc
      sql/table.cc

Diff too large for email (16325 lines, the limit is 10000).
No bundle (reason: revision is a merge).