From: Bjorn Munch
Date: January 12 2011 2:20pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2968)
List-Archive: http://lists.mysql.com/commits/128518
Message-Id: <201101121420.p0CEKogN019551@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/merge-51/ based on revid:bjorn.munch@stripped

 2968 Bjorn Munch	2011-01-12 [merge]
      merge from 5.1

    modified:
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/subselect4.result
      mysql-test/r/view_grant.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
      mysql-test/t/subselect4.test
      mysql-test/t/view_grant.test
      mysys/my_getsystime.c
      sql/handler.cc
      sql/item.h
      sql/item_func.h
      sql/item_timefunc.h
      sql/net_serv.cc
      sql/sql_base.cc
      sql/sql_partition.cc
      sql/sql_select.cc
      sql/sql_view.cc
      sql/table.cc

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